Merge pull request #850 from LoboEire/master

Stopped looping SFX still playing on intermission screen
edge-classic · Jan 18, 2025 · 44dbebd · 44dbebd
2 parents 45ba4d8 + ae12864
commit 44dbebd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -48,5 +48,5 @@ Bugs fixed
 - PNG textures/flats did not tile
 - MLOOK_TURN() and MLOOK_FACE() thing.ddf actions were exactly the same. Now MLOOK_TURN() affects horizontal and MLOOK_FACE() affects vertical.
 - Changed FACE() thing.ddf action to behave like it's horizontal equivalent TURN().
-
+- Stopped looping SFX still playing on intermission screen
 
diff --git a/source_files/edge/f_interm.cc b/source_files/edge/f_interm.cc
@@ -2055,6 +2055,13 @@ void IntermissionStart(void)
             break;
         }
     }
+
+    // Lobo 2025: if we have a camera set up we probably don't mind still hearing level sfx, otherwise nuke 'em ;)
+    if (!background_camera_map_object) 
+    {
+        StopLevelSoundEffects();
+        DestroyAllAmbientSounds();
+    }
 }
 
 //--- editor settings ---