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

Merge branch 'crossfade-fix' into 'master' 

Fix crossfades

See merge request STJr/SRB2Internal!514
This commit is contained in:
MascaraSnake 2019-11-23 04:14:07 -05:00
parent 2c85aa9f69 b24c709206
commit 4ccb4f5c8a
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/f_finale.h
View File

@ -152,9 +152,10 @@ extern wipestyle_t wipestyle;
typedef enum typedef enum
{ {
WSF_FADEOUT = 1, WSF_FADEOUT = 1,
WSF_FADEIN = 1<<1, WSF_FADEIN = 1<<1,
WSF_TOWHITE = 1<<2, WSF_TOWHITE = 1<<2,
WSF_CROSSFADE = 1<<3,
} wipestyleflags_t; } wipestyleflags_t;
extern wipestyleflags_t wipestyleflags; extern wipestyleflags_t wipestyleflags;

6
src/f_wipe.c
View File

@ -95,7 +95,7 @@ boolean WipeStageTitle = false;
INT32 lastwipetic = 0; INT32 lastwipetic = 0;
wipestyle_t wipestyle = WIPESTYLE_NORMAL; wipestyle_t wipestyle = WIPESTYLE_NORMAL;
wipestyleflags_t wipestyleflags = 0; wipestyleflags_t wipestyleflags = WSF_CROSSFADE;
#ifndef NOWIPE #ifndef NOWIPE
static UINT8 *wipe_scr_start; //screen 3 static UINT8 *wipe_scr_start; //screen 3
@ -404,7 +404,9 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu)
// don't know where else to put this. // don't know where else to put this.
// this any good? // this any good?
if (gamestate == GS_LEVEL || gamestate == GS_TITLESCREEN) if ((gamestate == GS_LEVEL || gamestate == GS_TITLESCREEN)
&& (wipestyleflags & (WSF_FADEIN|WSF_FADEOUT)) // only if one of those wipestyleflags are actually set
&& !(wipestyleflags & WSF_CROSSFADE)) // and if not crossfading
wipestyle = WIPESTYLE_LEVEL; wipestyle = WIPESTYLE_LEVEL;
else else
wipestyle = WIPESTYLE_NORMAL; wipestyle = WIPESTYLE_NORMAL;

6
src/g_game.c
View File

@ -1803,6 +1803,9 @@ void G_DoLoadLevel(boolean resetplayer)
// //
void G_StartTitleCard(void) void G_StartTitleCard(void)
{ {
wipestyleflags |= WSF_FADEIN;
wipestyleflags &= ~WSF_FADEOUT;
// The title card has been disabled for this map. // The title card has been disabled for this map.
// Oh well. // Oh well.
if (mapheaderinfo[gamemap-1]->levelflags & LF_NOTITLECARD) if (mapheaderinfo[gamemap-1]->levelflags & LF_NOTITLECARD)
@ -1819,8 +1822,6 @@ void G_StartTitleCard(void)
// start the title card // start the title card
WipeStageTitle = (!titlemapinaction); WipeStageTitle = (!titlemapinaction);
wipestyleflags |= WSF_FADEIN;
wipestyleflags &= ~WSF_FADEOUT;
} }
// //
@ -2855,6 +2856,7 @@ void G_DoReborn(INT32 playernum)
// Do a wipe // Do a wipe
wipegamestate = -1; wipegamestate = -1;
wipestyleflags = WSF_CROSSFADE;
if (camera.chase) if (camera.chase)
P_ResetCamera(&players[displayplayer], &camera); P_ResetCamera(&players[displayplayer], &camera);

2
src/p_setup.c
View File

@ -2725,7 +2725,7 @@ boolean P_SetupLevel(boolean skipprecip)
S_FadeOutStopMusic(MUSICRATE/4); //FixedMul(FixedDiv(F_GetWipeLength(wipedefs[wipe_speclevel_towhite])*NEWTICRATERATIO, NEWTICRATE), MUSICRATE) S_FadeOutStopMusic(MUSICRATE/4); //FixedMul(FixedDiv(F_GetWipeLength(wipedefs[wipe_speclevel_towhite])*NEWTICRATERATIO, NEWTICRATE), MUSICRATE)
F_WipeStartScreen(); F_WipeStartScreen();
wipestyleflags |= WSF_FADEOUT|WSF_TOWHITE; wipestyleflags |= (WSF_FADEOUT|WSF_TOWHITE);
#ifdef HWRENDER #ifdef HWRENDER
// uh.......... // uh..........