diff options
Diffstat (limited to 'src/strife')
| -rw-r--r-- | src/strife/doomstat.h | 7 | ||||
| -rw-r--r-- | src/strife/g_game.c | 6 | ||||
| -rw-r--r-- | src/strife/p_maputl.c | 4 | ||||
| -rw-r--r-- | src/strife/p_setup.c | 5 | ||||
| -rw-r--r-- | src/strife/st_stuff.c | 10 |
5 files changed, 17 insertions, 15 deletions
diff --git a/src/strife/doomstat.h b/src/strife/doomstat.h index 95803c29..cce091d8 100644 --- a/src/strife/doomstat.h +++ b/src/strife/doomstat.h @@ -102,10 +102,9 @@ extern boolean respawnmonsters; // Netgame? Only true if >1 player. extern boolean netgame; -// Flag: true only if started as net deathmatch. -// An enum might handle altdeath/cooperative better. -extern boolean deathmatch; - +// 0=Co-op; 1=Deathmatch; 2=Altdeath +extern int deathmatch; + // ------------------------- // Internal parameters for sound rendering. // These have been taken from the DOS version, diff --git a/src/strife/g_game.c b/src/strife/g_game.c index dc9ee351..5c3bfe03 100644 --- a/src/strife/g_game.c +++ b/src/strife/g_game.c @@ -122,7 +122,7 @@ int starttime; // for comparative timing purposes boolean viewactive; -boolean deathmatch; // only if started as net death +int deathmatch; // only if started as net death boolean netgame; // only true if packets are broadcast boolean playeringame[MAXPLAYERS]; player_t players[MAXPLAYERS]; @@ -702,8 +702,8 @@ void G_DoLoadLevel (void) joyxmove = joyymove = 0; mousex = mousey = 0; sendpause = sendsave = paused = false; - memset (mousebuttons, 0, sizeof(mousebuttons)); - memset (joybuttons, 0, sizeof(joybuttons)); + memset(mousearray, 0, sizeof(mousearray)); + memset(joyarray, 0, sizeof(joyarray)); if (testcontrols) { diff --git a/src/strife/p_maputl.c b/src/strife/p_maputl.c index ee8485ca..3c39a1b5 100644 --- a/src/strife/p_maputl.c +++ b/src/strife/p_maputl.c @@ -574,7 +574,7 @@ divline_t trace; boolean earlyout; int ptflags; -static void InterceptsOverrun(int num_intercepts, intercept_t *intercept); +//static void InterceptsOverrun(int num_intercepts, intercept_t *intercept); // // PIT_AddLineIntercepts. @@ -782,6 +782,7 @@ P_TraverseIntercepts extern fixed_t bulletslope; +#if 0 // Intercepts Overrun emulation, from PrBoom-plus. // Thanks to Andrey Budko (entryway) for researching this and his // implementation of Intercepts Overrun emulation in PrBoom-plus @@ -906,6 +907,7 @@ static void InterceptsOverrun(int num_intercepts, intercept_t *intercept) InterceptsMemoryOverrun(location + 4, intercept->isaline); InterceptsMemoryOverrun(location + 8, (int) intercept->d.thing); } +#endif // diff --git a/src/strife/p_setup.c b/src/strife/p_setup.c index 694d0185..80a49e75 100644 --- a/src/strife/p_setup.c +++ b/src/strife/p_setup.c @@ -700,8 +700,9 @@ static void PadRejectArray(byte *array, unsigned int len) if (len > sizeof(rejectpad)) { - fprintf(stderr, "PadRejectArray: REJECT lump too short to pad! (%i > %i)\n", - len, sizeof(rejectpad)); + fprintf(stderr, + "PadRejectArray: REJECT lump too short to pad! (%i > %i)\n", + len, (int) sizeof(rejectpad)); // Pad remaining space with 0 (or 0xff, if specified on command line). diff --git a/src/strife/st_stuff.c b/src/strife/st_stuff.c index 0be72b05..290edc5c 100644 --- a/src/strife/st_stuff.c +++ b/src/strife/st_stuff.c @@ -183,7 +183,7 @@ static boolean st_showkeys = false; // villsa [STRIFE] TODO - identify variables static int st_keypage = -1; -static int dword_88490 = 0; +// [unused] static int dword_88490 = 0; // haleyjd 09/19/10: [STRIFE] Cached player data static int st_lastcursorpos; @@ -226,8 +226,8 @@ static patch_t* invfontg[10]; // 0-9, yellow numbers static patch_t* invfonty[10]; -// 3 key-cards, 3 skulls -- [STRIFE] has a lot more keys than 3 :P -static patch_t* keys[NUMCARDS]; +// [unused] 3 key-cards, 3 skulls -- [STRIFE] has a lot more keys than 3 :P +//static patch_t* keys[NUMCARDS]; // ready-weapon widget static st_number_t w_ready; // haleyjd [STRIFE]: This is still used. @@ -242,8 +242,8 @@ static st_number_t w_ammo[NUMAMMO]; // haleyjd [STRIFE]: Still used. // max ammo widgets static st_number_t w_maxammo[NUMAMMO]; // haleyjd [STRIFE]: Still used. -// number of frags so far in deathmatch -static int st_fragscount; +// [unused] number of frags so far in deathmatch +//static int st_fragscount; cheatseq_t cheat_mus = CHEAT("spin", 2); // [STRIFE]: idmus -> spin |