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

Merge branch 'segaskip' into 'master'

Browse source 
Allow Skipping through the Sega Logo Faster

See merge request KartKrew/RingRacers!26
This commit is contained in:
Sal 2024-08-09 05:16:55 +00:00
commit 1cafadc997
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/f_finale.c
View file

@ -855,8 +855,8 @@ void F_IntroTicker(void)
const boolean disclaimerskippable = const boolean disclaimerskippable =
( (
intro_scenenum == INTROSCENE_DISCLAIMER intro_scenenum == INTROSCENE_DISCLAIMER
&& dc_state == DISCLAIMER_FINAL && (dc_state < DISCLAIMER_SLIDE
&& dc_tics >= (TICRATE/2) + (5*6) // bottom text needs to fade all the way in || (dc_state == DISCLAIMER_FINAL && dc_textfade == 0)) // bottom text needs to fade all the way in
); );
const boolean doskip = const boolean doskip =
( (
@ -874,7 +874,15 @@ void F_IntroTicker(void)
if (doskip && disclaimerskippable) if (doskip && disclaimerskippable)
{ {
dc_state = DISCLAIMER_OUT; if (dc_state == DISCLAIMER_FINAL) {
dc_state = DISCLAIMER_OUT;
I_FadeOutStopSong(MUSICRATE*2/3);
} else {
if (dc_state <= DISCLAIMER_FADE)
Music_Play("lawyer");
dc_state = DISCLAIMER_SLIDE;
dc_segaframe = 23;
}
dc_tics = 0; dc_tics = 0;
} }
else if (doskip || timetonext <= 0) else if (doskip || timetonext <= 0)