lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix NOWIPE bugs with colormap fade and title card

Browse source
This commit is contained in:
mazmazz 2020-05-23 22:47:30 -04:00
parent 8fee9a51ce
commit 272362a86f
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/f_wipe.c
View file

@ -614,6 +614,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
tic_t F_GetWipeLength(UINT8 wipetype) tic_t F_GetWipeLength(UINT8 wipetype)
{ {
#ifdef NOWIPE #ifdef NOWIPE
(void)wipetype;
return 0; return 0;
#else #else
static char lumpname[10] = "FADEmmss"; static char lumpname[10] = "FADEmmss";
@ -640,6 +641,7 @@ tic_t F_GetWipeLength(UINT8 wipetype)
boolean F_WipeExists(UINT8 wipetype) boolean F_WipeExists(UINT8 wipetype)
{ {
#ifdef NOWIPE #ifdef NOWIPE
(void)wipetype;
return false; return false;
#else #else
static char lumpname[10] = "FADEmm00"; static char lumpname[10] = "FADEmm00";

2
src/g_game.c
View file

@ -1866,6 +1866,7 @@ void G_StartTitleCard(void)
// //
void G_PreLevelTitleCard(void) void G_PreLevelTitleCard(void)
{ {
#ifndef NOWIPE
tic_t starttime = I_GetTime(); tic_t starttime = I_GetTime();
tic_t endtime = starttime + (PRELEVELTIME*NEWTICRATERATIO); tic_t endtime = starttime + (PRELEVELTIME*NEWTICRATERATIO);
tic_t nowtime = starttime; tic_t nowtime = starttime;
@ -1888,6 +1889,7 @@ void G_PreLevelTitleCard(void)
} }
if (!cv_showhud.value) if (!cv_showhud.value)
wipestyleflags = WSF_CROSSFADE; wipestyleflags = WSF_CROSSFADE;
#endif
} }
static boolean titlecardforreload = false; static boolean titlecardforreload = false;