diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 97b6c9358..4a2a0cc0f 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -539,11 +539,6 @@ void D_ResetTiccmds(void) D_Clearticcmd(textcmds[i]->tic); } -ticcmd_t *D_LocalTiccmd(UINT8 ss) -{ - return &localcmds[ss][0]; -} - void SendKick(UINT8 playernum, UINT8 msg) { UINT8 buf[2]; diff --git a/src/d_clisrv.h b/src/d_clisrv.h index 8ad038a36..65884362b 100644 --- a/src/d_clisrv.h +++ b/src/d_clisrv.h @@ -662,7 +662,6 @@ extern UINT8 playernode[MAXPLAYERS]; INT32 D_NumPlayers(void); void D_ResetTiccmds(void); -ticcmd_t *D_LocalTiccmd(UINT8 ss); tic_t GetLag(INT32 node); //UINT8 GetFreeXCmdSize(UINT8 playerid); diff --git a/src/doomstat.h b/src/doomstat.h index 6e1aa2485..f6e708be6 100644 --- a/src/doomstat.h +++ b/src/doomstat.h @@ -299,8 +299,6 @@ typedef struct #define LF_NORELOAD 8 ///< Don't reload level on death #define LF_NOZONE 16 ///< Don't include "ZONE" on level title #define LF_SECTIONRACE 32 ///< Section race level -#define LF_SUBTRACTNUM 64 ///< Use subtractive position number (for bright levels) - #define LF2_HIDEINMENU 1 ///< Hide in the multiplayer menu #define LF2_HIDEINSTATS 2 ///< Hide in the statistics screen diff --git a/src/info.c b/src/info.c index fcf0029e9..7afc76bf6 100644 --- a/src/info.c +++ b/src/info.c @@ -2614,7 +2614,7 @@ state_t states[NUMSTATES] = {SPR_KINV, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_KARTINVULN_SMALL3}, // S_KARTINVULN_SMALL2 {SPR_KINV, FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_KARTINVULN_SMALL4}, // S_KARTINVULN_SMALL3 {SPR_KINV, FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_KARTINVULN_SMALL5}, // S_KARTINVULN_SMALL4 - {SPR_KINV, FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_NULL}, // S_KARTINVULN_SMALL5 + {SPR_KINV, FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_NULL}, // S_KARTINVULN_SMALL5 {SPR_KINV, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_KARTINVULN_LARGE2}, // S_KARTINVULN_LARGE1 {SPR_KINV, FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_KARTINVULN_LARGE3}, // S_KARTINVULN_LARGE2 diff --git a/src/p_setup.c b/src/p_setup.c index 5d13df8b5..e4c22f253 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -615,10 +615,10 @@ static void P_SetupDirectionalLight(void) if (gamemap != oldmap || encoremode != oldencore || reinitmaplight) { - maplighting.contrast = M_RandomRange(0, 58); - maplighting.backlight = 0; - maplighting.directional = M_RandomRange(0, 1); // either on or off - maplighting.angle = M_RandomRange(-382, 382); + lighting->light_contrast = M_RandomRange(0, 58); + lighting->sprite_backlight = 0; + lighting->use_light_angle = M_RandomRange(0, 1); // either on or off + lighting->light_angle = M_RandomRange(-382, 382); reinitmaplight = false; } @@ -627,13 +627,6 @@ static void P_SetupDirectionalLight(void) oldencore = encoremode; return; } - else if (lighting->use_custom_light == false) - { - maplighting.contrast = 8; - maplighting.backlight = 0; - maplighting.directional = false; - maplighting.angle = 0; - } maplighting.contrast = lighting->light_contrast; maplighting.backlight = lighting->sprite_backlight; diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index 1262707a8..b622c4c45 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -501,9 +501,6 @@ FUNCNORETURN static ATTRNORETURN void signal_handler(INT32 num) write_backtrace(BT_CRASH_REASON_SIGNAL(num)); #endif - if (demo.recording) - G_SaveDemo(); - I_ReportSignal(num, 0); I_ShutdownSystem(); signal(num, SIG_DFL); //default signal action @@ -884,9 +881,6 @@ static void signal_handler_child(INT32 num) write_backtrace(BT_CRASH_REASON_SIGNAL(num)); #endif - if (demo.recording) - G_SaveDemo(); - signal(num, SIG_DFL); //default signal action raise(num); }