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

Further cleanup for Chat to not be whitelisted gamestates only

Browse source 
Reduces the complexity of D_Display by a lot!
This commit is contained in:
toaster 2023-09-01 20:46:20 +01:00
parent 62ab7bc0f9
commit ee7f54bc2a
1 changed files with 11 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/d_main.c
View file

@ -440,38 +440,18 @@ static void D_Display(void)
switch (gamestate) switch (gamestate)
{ {
case GS_TITLESCREEN: case GS_TITLESCREEN:
if (!titlemapinaction || !curbghide) { if (!titlemapinaction || !curbghide)
{
F_TitleScreenDrawer(); F_TitleScreenDrawer();
break;
} }
/* FALLTHRU */
case GS_LEVEL:
if (!gametic)
break;
HU_Erase();
AM_Drawer();
break; break;
case GS_INTERMISSION: case GS_INTERMISSION:
Y_IntermissionDrawer(); Y_IntermissionDrawer();
HU_Erase();
HU_Drawer();
break; break;
case GS_VOTING: case GS_VOTING:
Y_VoteDrawer(); Y_VoteDrawer();
HU_Erase();
HU_Drawer();
break;
case GS_CEREMONY:
if (!gametic)
break;
HU_Erase();
HU_Drawer();
break;
case GS_MENU:
break; break;
case GS_INTRO: case GS_INTRO:
@ -485,24 +465,14 @@ static void D_Display(void)
case GS_CUTSCENE: case GS_CUTSCENE:
F_CutsceneDrawer(); F_CutsceneDrawer();
HU_Erase();
HU_Drawer();
break; break;
case GS_EVALUATION: case GS_EVALUATION:
F_GameEvaluationDrawer(); F_GameEvaluationDrawer();
HU_Erase();
HU_Drawer();
break;
case GS_CONTINUING:
//F_ContinueDrawer();
break; break;
case GS_CREDITS: case GS_CREDITS:
F_CreditDrawer(); F_CreditDrawer();
HU_Erase();
HU_Drawer();
break; break;
case GS_WAITINGPLAYERS: case GS_WAITINGPLAYERS:
@ -511,14 +481,15 @@ static void D_Display(void)
{ {
// I don't think HOM from nothing drawing is independent... // I don't think HOM from nothing drawing is independent...
F_WaitingPlayersDrawer(); F_WaitingPlayersDrawer();
HU_Erase();
HU_Drawer();
} }
case GS_DEDICATEDSERVER: case GS_DEDICATEDSERVER:
case GS_NULL: case GS_NULL:
default:
break; break;
} }
HU_Erase();
// STUPID race condition... // STUPID race condition...
{ {
wipegamestate = gamestate; wipegamestate = gamestate;
@ -628,9 +599,9 @@ static void D_Display(void)
{ {
case GS_LEVEL: case GS_LEVEL:
{ {
AM_Drawer();
ST_Drawer(); ST_Drawer();
F_TextPromptDrawer(); F_TextPromptDrawer();
HU_Drawer();
break; break;
} }
case GS_TITLESCREEN: case GS_TITLESCREEN:
@ -655,6 +626,11 @@ static void D_Display(void)
} }
} }
if (Playing())
{
HU_Drawer();
}
// change gamma if needed // change gamma if needed
// (GS_LEVEL handles this already due to level-specific palettes) // (GS_LEVEL handles this already due to level-specific palettes)
if (forcerefresh && G_GamestateUsesLevel() == false) if (forcerefresh && G_GamestateUsesLevel() == false)