[Scummvm-cvs-logs] SF.net SVN: scummvm: [20976] scummvm/trunk/engines/scumm/room.cpp

[kirben at users.sourceforge.net]

Revision: 20976
Author:   kirben
Date:     2006-02-28 15:02:15 -0800 (Tue, 28 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20976&view=rev

Log Message:
-----------
Add comment to workaround for music in Sam & Max, based on commit log. And limit the workaround to specific game.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/room.cpp
Modified: scummvm/trunk/engines/scumm/room.cpp
===================================================================
--- scummvm/trunk/engines/scumm/room.cpp	2006-02-28 22:20:13 UTC (rev 20975)
+++ scummvm/trunk/engines/scumm/room.cpp	2006-02-28 23:02:15 UTC (rev 20976)
@@ -78,8 +78,17 @@
 	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();
 
 	// For HE80+ games