aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/room.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/scumm/room.cpp')
-rw-r--r--engines/scumm/room.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/engines/scumm/room.cpp b/engines/scumm/room.cpp
index 1c972fa299..c3f97a3546 100644
--- a/engines/scumm/room.cpp
+++ b/engines/scumm/room.cpp
@@ -78,7 +78,16 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) {
killScriptsAndResources();
if (_game.version >= 4 && _game.heversion <= 61)
stopCycle(0);
- _sound->processSound();
+
+ if (_game.id == GID_SAMNMAX) {
+ // WORKAROUND bug #85373 SAM: Overlapping music at Bigfoot convention
+ // Added sound queue processing between execution of exit
+ // script and entry script. In the case of this bug, the
+ // entry script required that the iMuse state be fully up
+ // to date, including last-moment changes from the previous
+ // exit script.
+ _sound->processSound();
+ }
clearDrawQueues();