From cf36e7d770b80867ce978abf474413a9237a8562 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 25 Aug 2020 18:28:50 +0200 Subject: [PATCH] - SW: stop cutscene sound before going to the summary screen. --- source/core/console/c_console.cpp | 1 + source/sw/src/2d.cpp | 2 +- source/sw/src/input.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/core/console/c_console.cpp b/source/core/console/c_console.cpp index ba3ff8c54..290e7d0ea 100644 --- a/source/core/console/c_console.cpp +++ b/source/core/console/c_console.cpp @@ -790,6 +790,7 @@ void FNotifyBuffer::AddString(int printlevel, FString source) int width; if (hud_messages == 0 || + screen == nullptr || source.IsEmpty() || gamestate == GS_FULLCONSOLE || gamestate == GS_MENUSCREEN || diff --git a/source/sw/src/2d.cpp b/source/sw/src/2d.cpp index 83af90581..0c61f2855 100644 --- a/source/sw/src/2d.cpp +++ b/source/sw/src/2d.cpp @@ -591,7 +591,7 @@ void StatScreen(int FinishAnim, CompletionFunc completion) if (FinishAnim) { StopSound(); - jobs[job++] = { GetFinishAnim(FinishAnim) }; + jobs[job++] = { GetFinishAnim(FinishAnim), []() { soundEngine->StopAllChannels(); } }; jobs[job++] = { Create() }; if (FinishAnim == ANIM_ZILLA) jobs[job++] = { Create() }; diff --git a/source/sw/src/input.cpp b/source/sw/src/input.cpp index 29ad32ad1..b62193c68 100644 --- a/source/sw/src/input.cpp +++ b/source/sw/src/input.cpp @@ -150,7 +150,7 @@ getinput(SW_PACKET *loc, SWBOOL tied) // If in 2D follow mode, scroll around using glob vars // Tried calling this in domovethings, but key response it too poor, skips key presses // 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); // !JIM! Added M_Active() so that you don't move at all while using menus