Skip to content

W
wolf3d
Commit a757e2c8 authored by Steven Fuller's avatar Steven Fuller
Browse files
Options

Got wolf3d shareware to build correctly

parent f365a035
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 93 deletions
src/IDEAS
View file @ a757e2c8
......@@ -3,3 +3,5 @@
* Game able to cope at any virtual resolution in software mode. OpenGL
handles this transparently
* Audio support using OpenAL
* Add support for the Mac version, if possible
* Network support!
src/TODO
View file @ a757e2c8
......@@ -18,3 +18,22 @@ maybe there are clipping bugs that will cause it to fill over the top, left,
and right
* if japan versions are not to be found, remove the code
* remove DEMOEXTERN, and add ability to play demos from commandline
* remove SPANISH code (and spanish.h)? honestly i would rather have a german
version than a spanish version
* remove GOODTIMES (the piracy message is somewhat worthless)
* then consider removing the SOD manual check
* fix wolf shareware gfx
* fix status bar gfx junk, and those tiles that do not wish to be extracted
* Use either US_CheckParm or MS_CheckParm.
* perhaps rename UPLOAD
TOO MANY #IFDEF.
and upload builds with lots of wl6 code anyway (sound references were just
ifdefed
* verify if the sounds and graphics are correctly numbered, once again...
* remove -fwritable-strings
* find out why shareware version produces these messages:
CA_FarRead only read 471 out of 1671
Trying to free null audio chunk 207!
CA_FarRead hit EOF?
CA_FarRead hit EOF?
CA_FarRead hit EOF?
src/audiowl1.h
View file @ a757e2c8
......@@ -84,6 +84,8 @@ typedef enum {
LASTSOUND
} soundnames;
#define YEAHSND NOWAYSND // TODO: YEAHSND not defined in here
//
// Base offsets
//
......@@ -126,6 +128,9 @@ typedef enum {
LASTMUSIC
} musicnames;
#define WARMARCH_MUS GETOUT_MUS // TODO: correct?
#define PACMAN_MUS WARMRCH1_MUS // Just changed the values to correspond to wl6
/////////////////////////////////////////////////
//
// Thanks for playing with MUSE!
......
src/gfxv_wl1.h
View file @ a757e2c8
......@@ -25,6 +25,7 @@ typedef enum {
H_LEFTWINDOWPIC, // 18
H_RIGHTWINDOWPIC, // 19
H_BOTTOMINFOPIC, // 20
H_SPEARINFO, /* TODO: this ruins the numbers :) */
// Lump Start
C_OPTIONSPIC, // 21
C_CURSOR1PIC, // 22
......@@ -53,6 +54,12 @@ typedef enum {
C_EPISODE5PIC, // 45
C_EPISODE6PIC, // 46
C_CODEPIC, // 47
C_TIMECODEPIC,
C_LEVELPIC,
C_NAMEPIC,
C_SCOREPIC,
C_JOY1PIC,
C_JOY2PIC,
// Lump Start
L_GUYPIC, // 48
L_COLONPIC, // 49
......@@ -94,6 +101,7 @@ typedef enum {
L_YPIC, // 85
L_ZPIC, // 86
L_EXPOINTPIC, // 87
L_APOSTROPHEPIC,
L_GUY2PIC, // 88
L_BJWINSPIC, // 89
STATUSBARPIC, // 90
......@@ -147,16 +155,23 @@ typedef enum {
PAUSEDPIC, // 137
GETPSYCHEDPIC, // 138
ORDERSCREEN=554,
ERRORSCREEN, // 555
ORDERSCREEN=148,
ERRORSCREEN,
T_HELPART,
T_DEMO0,
T_DEMO1,
T_DEMO2,
T_DEMO3,
T_ENDART1,
//ORDERSCREEN=554,
//ERRORSCREEN, // 555
ENUMEND
} graphicnums;
//
// Data LUMPs
//
/* TODO */
#define README_LUMP_START 3
#define README_LUMP_END 20
......@@ -176,16 +191,16 @@ typedef enum {
#define NUMCHUNKS 556
#define NUMFONT 2
#define NUMFONTM 0
#define NUMPICS 136
#define NUMPICS 144
#define NUMPICM 0
#define NUMSPRITES 0
#define NUMTILE8 72
#define NUMTILE8M 0
#define NUMTILE16 144
#define NUMTILE16M 270
#define NUMTILE16 0
#define NUMTILE16M 0
#define NUMTILE32 0
#define NUMTILE32M 0
#define NUMEXTERNS 2
#define NUMEXTERNS 8
//
// File offsets for data items
//
......@@ -194,15 +209,15 @@ typedef enum {
#define STARTFONT 1
#define STARTFONTM 3
#define STARTPICS 3
#define STARTPICM 139
#define STARTSPRITES 139
#define STARTTILE8 139
#define STARTTILE8M 140
#define STARTTILE16 140
#define STARTTILE16M 284
#define STARTTILE32 554
#define STARTTILE32M 554
#define STARTEXTERNS 554
#define STARTPICM 147
#define STARTSPRITES 147
#define STARTTILE8 147
#define STARTTILE8M 148
#define STARTTILE16 148
#define STARTTILE16M 148
#define STARTTILE32 148
#define STARTTILE32M 148
#define STARTEXTERNS 148
//
// Thank you for using IGRAB!
......
src/sdmver.h deleted 100644 → 0
View file @ f365a035
#define SPEAR
#define SPEARDEMO
#define ARTSEXTERN
#define DEMOSEXTERN
#define CARMACIZED
//#define MYPROFILE
//#define DEBCHECK
//#define UPLOAD
src/sodver.h deleted 100644 → 0
View file @ f365a035
#define SPEAR
#define ARTSEXTERN
#define DEMOSEXTERN
#define CARMACIZED
//#define MYPROFILE
//#define DEBCHECK
//#define UPLOAD
src/spanver.h deleted 100644 → 0
View file @ f365a035
//#define SPEAR
#define SPANISH
#define ARTSEXTERN
#define DEMOSEXTERN
//#define MYPROFILE
//#define DEBCHECK
#define CARMACIZED
//#define UPLOAD
src/version.h
View file @ a757e2c8
......@@ -5,7 +5,7 @@
/* WL6 = 1 */
/* SDM = 2 */
/* SOD = 3 */
#define WMODE 3
#define WMODE 0
#if WMODE == 0
/* #define SPEAR */
......@@ -15,7 +15,6 @@
#define GOODTIMES
#define DEMOSEXTERN
#define UPLOAD
#error "wl1 does not work yet"
#elif WMODE == 1
/* #define SPEAR */
......@@ -44,6 +43,11 @@
#define DEMOSEXTERN
/* #define UPLOAD */
/*
JAPANDEMO requires UPLOAD
SPANISH
*/
#else
#error "please edit version.h and fix WMODE"
#endif
......
src/wl_act2.c
View file @ a757e2c8
......@@ -322,6 +322,7 @@ void T_Projectile (objtype *ob)
if (!ProjectileTryMove (ob))
{
#ifndef UPLOAD
if (ob->obclass == rocketobj)
{
PlaySoundLocActor(MISSILEHITSND,ob);
......@@ -335,6 +336,7 @@ void T_Projectile (objtype *ob)
}
#endif
else
#endif
ob->state = NULL; // mark for removal
return;
......@@ -1059,6 +1061,7 @@ void SpawnPatrol (enemy_t which, int tilex, int tiley, int dir)
void A_DeathScream (objtype *ob)
{
/* TODO: what are on these maps? */
#ifndef UPLOAD
#ifndef SPEAR
if (mapon==9 && !US_RndT())
......@@ -1082,26 +1085,25 @@ void A_DeathScream (objtype *ob)
switch (ob->obclass)
{
case mutantobj:
PlaySoundLocActor(AHHHGSND,ob);
PlaySoundLocActor(AHHHGSND, ob);
break;
case guardobj:
{
int sounds[9]={ DEATHSCREAM1SND,
DEATHSCREAM2SND,
DEATHSCREAM3SND,
DEATHSCREAM4SND,
DEATHSCREAM5SND,
DEATHSCREAM7SND,
DEATHSCREAM8SND,
DEATHSCREAM9SND
};
#ifndef UPLOAD
PlaySoundLocActor(sounds[US_RndT()%8],ob);
#else
PlaySoundLocActor(sounds[US_RndT()%2],ob);
#endif
#ifndef UPLOAD
int sounds[8]={ DEATHSCREAM1SND, DEATHSCREAM2SND,
DEATHSCREAM3SND, DEATHSCREAM4SND,
DEATHSCREAM5SND, DEATHSCREAM7SND,
DEATHSCREAM8SND, DEATHSCREAM9SND
};
PlaySoundLocActor(sounds[US_RndT()%8], ob);
#else
int sounds[3]={ DEATHSCREAM1SND,
DEATHSCREAM2SND,
DEATHSCREAM3SND
};
PlaySoundLocActor(sounds[US_RndT()%3],ob);
#endif
}
break;
case officerobj:
......@@ -1117,6 +1119,7 @@ void A_DeathScream (objtype *ob)
case bossobj:
SD_PlaySound(MUTTISND); // JAB
break;
#ifndef UPLOAD
case schabbobj:
SD_PlaySound(MEINGOTTSND);
break;
......@@ -1138,6 +1141,7 @@ void A_DeathScream (objtype *ob)
case fatobj:
SD_PlaySound(ROSESND);
break;
#endif /* UPLOAD */
#else
case spectreobj:
SD_PlaySound(GHOSTFADESND);
......@@ -2321,7 +2325,9 @@ void T_SchabbThrow (objtype *ob)
new->flags = FL_NONMARK;
new->active = true;
PlaySoundLocActor (SCHABBSTHROWSND,new);
#ifndef UPLOAD
PlaySoundLocActor(SCHABBSTHROWSND, new);
#endif
}
/*
......@@ -2360,7 +2366,9 @@ void T_GiftThrow (objtype *ob)
new->flags = FL_NONMARK;
new->active = true;
PlaySoundLocActor (MISSILEFIRESND,new);
#ifndef UPLOAD
PlaySoundLocActor(MISSILEFIRESND, new);
#endif
}
......@@ -2905,16 +2913,18 @@ void A_HitlerMorph (objtype *ob)
// A_Slurpie
//
////////////////////////////////////////////////////////
void A_MechaSound (objtype *ob)
void A_MechaSound(objtype *ob)
{
#ifndef UPLOAD
if (areabyplayer[ob->areanumber])
PlaySoundLocActor (MECHSTEPSND,ob);
PlaySoundLocActor(MECHSTEPSND, ob);
#endif
}
void A_Slurpie (objtype *ob)
void A_Slurpie(objtype *ob)
{
SD_PlaySound(SLURPIESND);
SD_PlaySound(SLURPIESND);
}
/*
......@@ -2953,11 +2963,11 @@ void T_FakeFire (objtype *ob)
new->flags = FL_NEVERMARK;
new->active = true;
PlaySoundLocActor (FLAMETHROWERSND,new);
#ifndef UPLOAD
PlaySoundLocActor(FLAMETHROWERSND, new);
#endif
}
/*
=================
=
......@@ -3039,7 +3049,7 @@ void T_Fake (objtype *ob)
===============
*/
void T_Stand (objtype *ob)
void T_Stand(objtype *ob)
{
SightPlayer (ob);
}
......@@ -3493,19 +3503,23 @@ void T_Shoot (objtype *ob)
#ifndef SPEAR
case giftobj:
case fatobj:
#ifndef UPLOAD
PlaySoundLocActor(MISSILEFIRESND,ob);
#endif
break;
case mechahitlerobj:
case realhitlerobj:
case bossobj:
PlaySoundLocActor(BOSSFIRESND,ob);
break;
#ifndef UPLOAD
case schabbobj:
PlaySoundLocActor(SCHABBSTHROWSND,ob);
break;
case fakeobj:
PlaySoundLocActor(FLAMETHROWERSND,ob);
break;
#endif
#endif
default:
PlaySoundLocActor(NAZIFIRESND,ob);
......
src/wl_state.c
View file @ a757e2c8
......@@ -1293,19 +1293,25 @@ void FirstSighting (objtype *ob)
break;
case gretelobj:
#ifndef UPLOAD
SD_PlaySound(KEINSND);
#endif
NewState (ob,&s_gretelchase1);
ob->speed *= 3; // go faster when chasing player
break;
case giftobj:
#ifndef UPLOAD
SD_PlaySound(EINESND);
#endif
NewState (ob,&s_giftchase1);
ob->speed *= 3; // go faster when chasing player
break;
case fatobj:
#ifndef UPLOAD
SD_PlaySound(ERLAUBENSND);
#endif
NewState (ob,&s_fatchase1);
ob->speed *= 3; // go faster when chasing player
break;
......
src/wlfj1ver.h deleted 100644 → 0
View file @ f365a035
//#define SPEAR
#define JAPAN
#define JAPDEMO
#define UPLOAD
#define DEMOSEXTERN
#define CARMACIZED
src/wolf1ver.h deleted 100644 → 0
View file @ f365a035
//#define SPEAR
#define ARTSEXTERN
#define DEMOSEXTERN
//#define MYPROFILE
//#define DEBCHECK
#define CARMACIZED
#define UPLOAD
src/wolfjver.h deleted 100644 → 0
View file @ f365a035
//#define SPEAR
#define JAPAN
#define DEMOSEXTERN
#define CARMACIZED
//#define UPLOAD
src/wolfver.h deleted 100644 → 0
View file @ f365a035
//#define SPEAR
#define ARTSEXTERN
#define DEMOSEXTERN
//#define MYPROFILE
//#define DEBCHECK
#define CARMACIZED
//#define UPLOAD
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment