thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'testers220430' into 'master'

Browse source 
Minor prep for 220430 test

See merge request KartKrew/Kart!576
This commit is contained in:
toaster 2022-05-07 13:53:03 +00:00
commit c0830d1ddc
3 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/f_finale.c
View file

@ -1974,8 +1974,17 @@ void F_TitleScreenDrawer(void)
V_DrawSmallScaledPatch(84, 36, transval<<V_ALPHASHIFT, ttkflash); V_DrawSmallScaledPatch(84, 36, transval<<V_ALPHASHIFT, ttkflash);
} }
*/ */
V_DrawCenteredString(BASEVIDWIDTH/2, 64, 0, "SRB2 Kart v2.0"); V_DrawCenteredString(BASEVIDWIDTH/2, 64, V_ALLOWLOWERCASE, "SRB2 Kart v2.0");
V_DrawCenteredString(BASEVIDWIDTH/2, 96, 0, "Development EXE");
#ifdef DEVELOP
#if defined(TESTERS)
V_DrawCenteredString(BASEVIDWIDTH/2, 96, V_SKYMAP|V_ALLOWLOWERCASE, "Tester EXE");
#elif defined(HOSTTESTERS)
V_DrawCenteredThinString(BASEVIDWIDTH/2, 96, V_REDMAP|V_ALLOWLOWERCASE, "Tester netgame host EXE");
#else
V_DrawCenteredString(BASEVIDWIDTH/2, 96, V_ALLOWLOWERCASE, "Development EXE");
#endif
#endif
break; break;
case TTMODE_USER: case TTMODE_USER:

10
src/g_game.c
View file

@ -1308,6 +1308,16 @@ void G_StartTitleCard(void)
// prepare status bar // prepare status bar
ST_startTitleCard(); ST_startTitleCard();
// play the sound
{
sfxenum_t kstart = sfx_kstart;
if (bossinfo.boss)
kstart = sfx_ssa021;
else if (encoremode)
kstart = sfx_ruby2;
S_StartSound(NULL, kstart);
}
// start the title card // start the title card
WipeStageTitle = (!titlemapinaction); WipeStageTitle = (!titlemapinaction);
} }

9
src/p_setup.c
View file

@ -4259,15 +4259,6 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
} }
F_RunWipe(wipedefs[wipe_level_toblack], false, ((levelfadecol == 0) ? "FADEMAP1" : "FADEMAP0"), false, false); F_RunWipe(wipedefs[wipe_level_toblack], false, ((levelfadecol == 0) ? "FADEMAP1" : "FADEMAP0"), false, false);
{
sfxenum_t kstart = sfx_kstart;
if (bossinfo.boss)
kstart = sfx_ssa021;
else if (encoremode)
kstart = sfx_ruby2;
S_StartSound(NULL, kstart);
}
} }
/*if (!titlemapinaction) /*if (!titlemapinaction)
wipegamestate = GS_LEVEL;*/ wipegamestate = GS_LEVEL;*/