- fix sound and music pausing with tweaks to updatePauseStatus(). A…

…lso removed unneeded game-side function. Fixes #11.
ZDoom · Jul 26, 2020 · f67a53a · f67a53a
1 parent c7a9b56
commit f67a53a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 34 deletions.
diff --git a/source/core/gamecontrol.cpp b/source/core/gamecontrol.cpp
@@ -1102,33 +1102,26 @@ bool CheckCheatmode(bool printmsg)
 
 void updatePauseStatus()
 {
-	bool GUICapture = System_WantGuiCapture();
-    if (M_Active() || ConsoleState != c_up)
+    if (M_Active() || System_WantGuiCapture())
     {
         paused = 1;
-		return;
     }
-    else if (!pausedWithKey)
+    else if (!M_Active() || !System_WantGuiCapture())
     {
-        paused = 0;
-    }
-
-    if (inputState.GetKeyStatus(sc_Pause))
-    {
-        inputState.ClearKeyStatus(sc_Pause);
-		paused = pausedWithKey ? 0 : 2;
-
-        if (paused)
+        if (!pausedWithKey)
         {
-            S_PauseSound(!paused, !paused);
+            paused = 0;
         }
-        else
+
+        if (inputState.GetKeyStatus(sc_Pause))
         {
-            S_ResumeSound(!!paused);
+            inputState.ClearKeyStatus(sc_Pause);
+            paused = pausedWithKey ? 0 : 2;
+            pausedWithKey = !!paused;
         }
-
-        pausedWithKey = !!paused;
     }
+
+    paused ? S_PauseSound(!pausedWithKey, !paused) : S_ResumeSound(paused);
 }
 
 bool OkForLocalization(FTextureID texnum, const char* substitute)

diff --git a/source/games/duke/src/d_menu.cpp b/source/games/duke/src/d_menu.cpp
@@ -215,7 +215,6 @@ void GameInterface::DrawNativeMenuText(int fontnum, int state, double oxpos, dou
 
 void GameInterface::MenuOpened()
 {
-	S_PauseSounds(true);
 	if (ud.multimode < 2)
 	{
 		ready2send = 0;
@@ -263,8 +262,6 @@ void GameInterface::MenuClosed()
 			cameraclock = (int32_t)totalclock;
 			cameradist = 65536;
 		}
-
-		S_PauseSounds(false);
 	}
 }
 

diff --git a/source/games/duke/src/premap.cpp b/source/games/duke/src/premap.cpp
@@ -959,7 +959,7 @@ int enterlevel(MapRecord *mi, int gamemode)
     OnEvent(EVENT_ENTERLEVEL);
 
     // Stop all sounds
-    S_PauseSounds(false);
+    S_ResumeSound(false);
     FX_StopAllSounds();
     FX_SetReverb(0);
 

diff --git a/source/games/duke/src/sounds.cpp b/source/games/duke/src/sounds.cpp
@@ -95,17 +95,6 @@ TArray<uint8_t> DukeSoundEngine::ReadSound(int lumpnum)
 //
 //==========================================================================
 
-void S_PauseSounds(bool paused)
-{
-	soundEngine->SetPaused(paused);
-}
-
-//==========================================================================
-//
-// 
-//
-//==========================================================================
-
 void S_CacheAllSounds(void)
 {
 	auto& sfx = soundEngine->GetSounds();

diff --git a/source/games/duke/src/sounds.h b/source/games/duke/src/sounds.h
@@ -52,7 +52,6 @@ inline int S_CheckSoundPlaying(int sprnum, int soundNum) { return S_CheckSoundPl
 int S_CheckActorSoundPlaying(int spriteNum, int soundNum, int channel = 0);
 int S_CheckAnyActorSoundPlaying(int spriteNum);
 
-void S_PauseSounds(bool paused);
 void S_ChangeSoundPitch(int soundNum, int spriteNum, int pitchoffset);
 int S_GetUserFlags(int sndnum);