zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-13 07:31:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- stop all sound before showing ENDOOM.

Browse source
This commit is contained in:
Christoph Oelckers 2022-11-16 17:08:11 +01:00
parent d0c86952ee
commit eb97346b0e
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/startscreen/endoom.cpp
View file

@ -192,6 +192,7 @@ int RunEndoom()
return 0; return 0;
} }
[[noreturn]]
void ST_Endoom() void ST_Endoom()
{ {
int code = RunEndoom(); int code = RunEndoom();

3
src/common/startscreen/startscreen.h
View file

@ -102,4 +102,5 @@ protected:
FStartScreen* GetGameStartScreen(int max_progress); FStartScreen* GetGameStartScreen(int max_progress);
extern void ST_Endoom(); [[noreturn]]
void ST_Endoom();

15
src/menu/doommenu.cpp
View file

@ -66,6 +66,7 @@
#include "teaminfo.h" #include "teaminfo.h"
#include "i_time.h" #include "i_time.h"
#include "shiftstate.h" #include "shiftstate.h"
#include "s_music.h"
#include "hwrenderer/scene/hw_drawinfo.h" #include "hwrenderer/scene/hw_drawinfo.h"
EXTERN_CVAR(Int, cl_gfxlocalization) EXTERN_CVAR(Int, cl_gfxlocalization)
@ -294,6 +295,14 @@ void System_M_Dim()
} }
static void M_Quit()
{
S_StopAllChannels();
S_StopMusic(true);
CleanSWDrawer();
ST_Endoom();
}
//============================================================================= //=============================================================================
// //
// //
@ -304,8 +313,7 @@ CCMD (menu_quit)
{ // F10 { // F10
if (m_quickexit) if (m_quickexit)
{ {
CleanSWDrawer(); M_Quit();
ST_Endoom();
} }
M_StartControlPanel (true); M_StartControlPanel (true);
@ -336,8 +344,7 @@ CCMD (menu_quit)
I_WaitVBL(105); I_WaitVBL(105);
} }
} }
CleanSWDrawer(); M_Quit();
ST_Endoom();
}); });