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

Skip intro fade in if there is no previous gamestate

Browse source
This commit is contained in:
Lactozilla 2023-12-27 18:33:43 -03:00
parent a66d5751e7
commit 12c97ab53e
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/f_finale.c
View file

@ -332,9 +332,6 @@ static tic_t introscenetime[NUMINTROSCENES] =
25*TICRATE, // I'm just finding what mission obje...
};
// custom intros
void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer, boolean FLS);
void F_StartIntro(void)
{
S_StopMusic();
@ -342,6 +339,7 @@ void F_StartIntro(void)
ScreenWipe_StopAll();
// custom intros
if (introtoplay)
{
if (!cutscenes[introtoplay - 1])
@ -493,7 +491,7 @@ void F_StartIntro(void)
"\x80\n\xA9\xD2\xD2"
"\"All right, then\xAF... \xD2\xD2\xA7let's go!\"\n#");
boolean from_title = gamestate == GS_TITLESCREEN;
boolean do_fade_out = gamestate != GS_NULL;
G_SetGamestate(GS_INTRO);
gameaction = ga_nothing;
@ -507,7 +505,7 @@ void F_StartIntro(void)
finalecount = animtimer = skullAnimCounter = stoptimer = 0;
timetonext = introscenetime[intro_scenenum];
if (from_title)
if (do_fade_out)
{
wipe_t wipe = {0};
wipe.style = ScreenWipe_GetStyle(wipe.flags);

2
src/f_wipe.c
View file

@ -59,7 +59,7 @@ UINT8 wipedefs[NUMWIPEDEFS] = {
99, // wipe_credits_toblack
0, // wipe_evaluation_toblack
0, // wipe_gameend_toblack
99, // wipe_intro_toblack (hardcoded)
0, // wipe_intro_toblack (hardcoded)
0, // wipe_ending_toblack
99, // wipe_cutscene_toblack (hardcoded)