zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 04:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

- do not stop the music in the cross-game level-end handler.

Browse source 
Some maps require that it continues playing here.
This commit is contained in:
Christoph Oelckers 2020-09-27 20:42:55 +02:00
parent 9ab29f5975
commit 47c1c22ff7
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/blood/src/endgame.cpp
View file

@ -167,6 +167,7 @@ void GameInterface::LevelCompleted(MapRecord *map, int skill)
{ {
JobDesc job = { Create<DBloodSummaryScreen>() }; JobDesc job = { Create<DBloodSummaryScreen>() };
sndStartSample(268, 128, -1, false, CHANF_UI); sndStartSample(268, 128, -1, false, CHANF_UI);
Mus_Stop();
RunScreenJob(&job, 1, [=](bool) RunScreenJob(&job, 1, [=](bool)
{ {
soundEngine->StopAllChannels(); soundEngine->StopAllChannels();

1
source/core/mainloop.cpp
View file

@ -163,7 +163,6 @@ static void GameTicker()
case ga_completed: case ga_completed:
FX_StopAllSounds(); FX_StopAllSounds();
FX_SetReverb(0); FX_SetReverb(0);
Mus_Stop();
if (g_nextmap == currentLevel) if (g_nextmap == currentLevel)
{ {
// if the same level is restarted, skip any progression stuff like summary screens or cutscenes. // if the same level is restarted, skip any progression stuff like summary screens or cutscenes.

4
source/exhumed/src/gameloop.cpp
View file

@ -47,6 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "core/menu/menu.h" #include "core/menu/menu.h"
#include "d_net.h" #include "d_net.h"
#include "automap.h" #include "automap.h"
#include "raze_music.h"
BEGIN_PS_NS BEGIN_PS_NS
@ -221,7 +222,8 @@ void GameInterface::NewGame(MapRecord *map, int skill)
void GameInterface::LevelCompleted(MapRecord *map, int skill) void GameInterface::LevelCompleted(MapRecord *map, int skill)
{ {
if (currentLevel->levelNumber == 0) gameaction = ga_mainmenu; Mus_Stop();
if (currentLevel->levelNumber == 0) gameaction = ga_mainmenu;
else Intermission(currentLevel, map); else Intermission(currentLevel, map);
} }