thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-25 19:43:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rework how the intro behaves in interpolated time

Browse source 
The old way was a mishmash... now the one scene transition is handled in F_IntroTicker alongside all other timed events.

Done in this branch because it uses the v1 version of interpolation as a primary reference.
This commit is contained in:
toaster 2022-08-28 17:43:14 +01:00
parent 1a814885da
commit 5abd6b6b44
1 changed files with 25 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/f_finale.c
View file

@ -377,10 +377,31 @@ static void F_IntroDrawScene(void)
//
void F_IntroDrawer(void)
{
if (timetonext <= 0)
// Used to be this whole thing, but now...
F_IntroDrawScene();
}
//
// F_IntroTicker
//
void F_IntroTicker(void)
{
// advance animation
finalecount++;
timetonext--;
if (intro_scenenum == 0)
{
if (intro_scenenum == 0)
if (timetonext <= 0)
{
#if 0 // The necessary apparatus for constructing more elaborate intros...
intro_scenenum++;
F_NewCutscene(introtext[intro_scenenum]);
timetonext = introscenetime[intro_scenenum];
wipegamestate = -1;
animtimer = stoptimer = 0;
#endif
if (rendermode != render_none)
{
F_WipeStartScreen();
@ -420,39 +441,8 @@ void F_IntroDrawer(void)
}
D_StartTitle();
// Yes, this is a weird hack, we need to force a wipe for this because the game state has changed in the middle of where it would normally wipe
// Need to set the wipe start and then draw the first frame of the title screen to get it working
F_WipeStartScreen();
F_TitleScreenDrawer();
wipegamestate = -1; // force a wipe
return;
}
F_NewCutscene(introtext[++intro_scenenum]);
timetonext = introscenetime[intro_scenenum];
F_WipeStartScreen();
wipegamestate = -1;
animtimer = stoptimer = 0;
}
intro_curtime = introscenetime[intro_scenenum] - timetonext;
F_IntroDrawScene();
}
//
// F_IntroTicker
//
void F_IntroTicker(void)
{
// advance animation
finalecount++;
timetonext--;
if (intro_scenenum == 0)
{
if (finalecount == 8)
S_StartSound(NULL, sfx_vroom);
else if (finalecount == 47)
@ -465,6 +455,8 @@ void F_IntroTicker(void)
}
}
intro_curtime = introscenetime[intro_scenenum] - timetonext;
F_WriteText();
// check for skipping