From 2892e33f1dc55bc53c8d12827ee9e4ee9c078402 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Tue, 28 Feb 2006 23:02:15 +0000 Subject: Add comment to workaround for music in Sam & Max, based on commit log. And limit the workaround to specific game. svn-id: r20976 --- engines/scumm/room.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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(); -- cgit v1.2.3