Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff

This commit is contained in:
Alug committed 2025-05-16 13:42:46 +02:00
commit 9feda4d22d
3 files changed
+7 -4

No files matched your search

+1
View File
@@ -472,6 +472,7 @@ static boolean D_Display(void)
F_TitleScreenDrawer();
if (wipe)
wipedefindex = wipe_titlescreen_toblack;
HU_Drawer();
break;
case GS_WAITINGPLAYERS:
+1
View File
@@ -1953,6 +1953,7 @@ void G_Ticker(boolean run)
case GS_TITLESCREEN:
F_TitleScreenTicker(run);
HU_Ticker();
break;
case GS_WAITINGPLAYERS:
if (netgame)
+5 -4
View File
@@ -2203,9 +2203,14 @@ void HU_Drawer(void)
if (cechotimer)
HU_DrawCEcho();
// draw song credits
if (cv_songcredits.value)
HU_DrawSongCredits();
if (!( Playing() || demo.playback )
|| gamestate == GS_INTERMISSION || gamestate == GS_CUTSCENE
|| gamestate == GS_CREDITS || gamestate == GS_EVALUATION
|| gamestate == GS_TITLESCREEN
|| gamestate == GS_GAMEEND
|| gamestate == GS_VOTING || gamestate == GS_WAITINGPLAYERS) // SRB2kart
return;
@@ -2236,10 +2241,6 @@ void HU_Drawer(void)
if (gamestate != GS_LEVEL)
return;
// draw song credits
if (cv_songcredits.value)
HU_DrawSongCredits();
// draw desynch text
if (hu_resynching
#ifdef SATURNPAK