Draw game "Pause" text above level + menu background, but below menu text

Prevents the need for carving exceptions like the Stereo Mode or various mid-game Options (would otherwise have been needed)
This commit is contained in:
toaster 2023-11-13 21:33:02 +00:00
parent 4f5997fbe6
commit da1cdd0825

View file

@ -775,6 +775,7 @@ void M_Drawer(void)
if (menuwipe) if (menuwipe)
F_WipeStartScreen(); F_WipeStartScreen();
// background layer
if (menuactive) if (menuactive)
{ {
if (gamestate == GS_MENU) if (gamestate == GS_MENU)
@ -785,7 +786,17 @@ void M_Drawer(void)
{ {
V_DrawFadeScreen(122, 3); V_DrawFadeScreen(122, 3);
} }
}
// draw pause pic
if (paused && !demo.playback && (menuactive || cv_showhud.value))
{
M_DrawPausedText(0);
}
// foreground layer
if (menuactive)
{
if (currentMenu->drawroutine) if (currentMenu->drawroutine)
currentMenu->drawroutine(); // call current menu Draw routine currentMenu->drawroutine(); // call current menu Draw routine
@ -813,18 +824,6 @@ void M_Drawer(void)
menuwipe = false; menuwipe = false;
} }
// draw pause pic
if (paused && !demo.playback && (menuactive || cv_showhud.value))
{
// Don't cover the Stereo player!
boolean stereo_open = menuactive && currentMenu == &MISC_SoundTestDef;
if (stereo_open == false)
{
M_DrawPausedText(0);
}
}
if (netgame && Playing()) if (netgame && Playing())
{ {
boolean mainpause_open = menuactive && currentMenu == &PAUSE_MainDef; boolean mainpause_open = menuactive && currentMenu == &PAUSE_MainDef;