stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-22 11:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't force FLS to false after a pre-map cutscene

Browse source
This commit is contained in:
spherallic 2023-04-28 15:30:02 +02:00
parent e5a1fee759
commit d6cafea571
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/f_finale.c
View file

@ -337,7 +337,7 @@ static tic_t introscenetime[NUMINTROSCENES] =
}; };
// custom intros // custom intros
void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer); void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer, boolean FLS);
void F_StartIntro(void) void F_StartIntro(void)
{ {
@ -349,7 +349,7 @@ void F_StartIntro(void)
if (!cutscenes[introtoplay - 1]) if (!cutscenes[introtoplay - 1])
D_StartTitle(); D_StartTitle();
else else
F_StartCustomCutscene(introtoplay - 1, false, false); F_StartCustomCutscene(introtoplay - 1, false, false, false);
return; return;
} }
@ -1257,7 +1257,7 @@ void F_StartCredits(void)
if (creditscutscene) if (creditscutscene)
{ {
F_StartCustomCutscene(creditscutscene - 1, false, false); F_StartCustomCutscene(creditscutscene - 1, false, false, false);
return; return;
} }
@ -3859,7 +3859,7 @@ static INT32 scenenum, cutnum;
static INT32 picxpos, picypos, picnum, pictime, picmode, numpics, pictoloop; static INT32 picxpos, picypos, picnum, pictime, picmode, numpics, pictoloop;
static INT32 textxpos, textypos; static INT32 textxpos, textypos;
static boolean cutsceneover = false; static boolean cutsceneover = false;
static boolean runningprecutscene = false, precutresetplayer = false; static boolean runningprecutscene = false, precutresetplayer = false, precutFLS = false;
static void F_AdvanceToNextScene(void) static void F_AdvanceToNextScene(void)
{ {
@ -3928,7 +3928,7 @@ void F_EndCutScene(void)
if (runningprecutscene) if (runningprecutscene)
{ {
if (server) if (server)
D_MapChange(gamemap, gametype, ultimatemode, precutresetplayer, 0, true, false); D_MapChange(gamemap, gametype, ultimatemode, precutresetplayer, 0, true, precutFLS);
} }
else else
{ {
@ -3943,7 +3943,7 @@ void F_EndCutScene(void)
} }
} }
void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer) void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer, boolean FLS)
{ {
if (!cutscenes[cutscenenum]) if (!cutscenes[cutscenenum])
return; return;
@ -3962,6 +3962,7 @@ void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean reset
cutsceneover = false; cutsceneover = false;
runningprecutscene = precutscene; runningprecutscene = precutscene;
precutresetplayer = resetplayer; precutresetplayer = resetplayer;
precutFLS = FLS;
scenenum = picnum = 0; scenenum = picnum = 0;
cutnum = cutscenenum; cutnum = cutscenenum;

2
src/f_finale.h
View file

@ -52,7 +52,7 @@ void F_EndingDrawer(void);
void F_CreditTicker(void); void F_CreditTicker(void);
void F_CreditDrawer(void); void F_CreditDrawer(void);
void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer); void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer, boolean FLS);
void F_CutsceneDrawer(void); void F_CutsceneDrawer(void);
void F_EndCutScene(void); void F_EndCutScene(void);

4
src/g_game.c
View file

@ -4108,7 +4108,7 @@ void G_AfterIntermission(void)
&& stagefailed == false) && stagefailed == false)
{ {
// Start a custom cutscene. // Start a custom cutscene.
F_StartCustomCutscene(mapheaderinfo[gamemap-1]->cutscenenum-1, false, false); F_StartCustomCutscene(mapheaderinfo[gamemap-1]->cutscenenum-1, false, false, false);
} }
else else
{ {
@ -4958,7 +4958,7 @@ void G_InitNew(UINT8 pultmode, const char *mapname, boolean resetplayer, boolean
imcontinuing = false; imcontinuing = false;
if ((gametyperules & GTR_CUTSCENES) && !skipprecutscene && mapheaderinfo[gamemap-1]->precutscenenum && !modeattacking && !(marathonmode & MA_NOCUTSCENES)) // Start a custom cutscene. if ((gametyperules & GTR_CUTSCENES) && !skipprecutscene && mapheaderinfo[gamemap-1]->precutscenenum && !modeattacking && !(marathonmode & MA_NOCUTSCENES)) // Start a custom cutscene.
F_StartCustomCutscene(mapheaderinfo[gamemap-1]->precutscenenum-1, true, resetplayer); F_StartCustomCutscene(mapheaderinfo[gamemap-1]->precutscenenum-1, true, resetplayer, FLS);
else else
G_DoLoadLevel(resetplayer); G_DoLoadLevel(resetplayer);