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

- SW: stop cutscene sound before going to the summary screen.

Browse source
This commit is contained in:
Christoph Oelckers 2020-08-25 18:28:50 +02:00
parent 7d30218d8e
commit cf36e7d770
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/core/console/c_console.cpp
View file

@ -790,6 +790,7 @@ void FNotifyBuffer::AddString(int printlevel, FString source)
int width; int width;
if (hud_messages == 0 || if (hud_messages == 0 ||
screen == nullptr ||
source.IsEmpty() || source.IsEmpty() ||
gamestate == GS_FULLCONSOLE || gamestate == GS_FULLCONSOLE ||
gamestate == GS_MENUSCREEN || gamestate == GS_MENUSCREEN ||

2
source/sw/src/2d.cpp
View file

@ -591,7 +591,7 @@ void StatScreen(int FinishAnim, CompletionFunc completion)
if (FinishAnim) if (FinishAnim)
{ {
StopSound(); StopSound();
jobs[job++] = { GetFinishAnim(FinishAnim) }; jobs[job++] = { GetFinishAnim(FinishAnim), []() { soundEngine->StopAllChannels(); } };
jobs[job++] = { Create<DSWLevelSummaryScreen>() }; jobs[job++] = { Create<DSWLevelSummaryScreen>() };
if (FinishAnim == ANIM_ZILLA) if (FinishAnim == ANIM_ZILLA)
jobs[job++] = { Create<DSWCreditsScreen>() }; jobs[job++] = { Create<DSWCreditsScreen>() };

2
source/sw/src/input.cpp
View file

@ -150,7 +150,7 @@ getinput(SW_PACKET *loc, SWBOOL tied)
// If in 2D follow mode, scroll around using glob vars // If in 2D follow mode, scroll around using glob vars
// Tried calling this in domovethings, but key response it too poor, skips key presses // Tried calling this in domovethings, but key response it too poor, skips key presses
// Note: this get called only during follow mode // Note: this get called only during follow mode
if (!tied && automapFollow && automapMode != am_off && && pp == Player + myconnectindex && !Prediction) if (!tied && automapFollow && automapMode != am_off && pp == Player + myconnectindex && !Prediction)
MoveScrollMode2D(Player + myconnectindex); MoveScrollMode2D(Player + myconnectindex);
// !JIM! Added M_Active() so that you don't move at all while using menus // !JIM! Added M_Active() so that you don't move at all while using menus