[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.72,2.73

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv13805/scummvm/scumm

Modified Files:
	imuse.cpp 
Log Message:
Fix for Bug [780918] SAM: Music stops at Bumpusville

Tweaked handling of ImSetTrigger when the triggered
command starts a new song. If the song to be started
is already playing, we stop it (in preparation for
a restart) ONLY if the song containing the command
trigger is actually playing. Otherwise the restart
is likely to never occur (as is the case with the
Bumpusville mansion interior music).

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.72
retrieving revision 2.73
diff -u -d -r2.72 -r2.73
--- imuse.cpp	5 Aug 2003 23:58:24 -0000	2.72
+++ imuse.cpp	6 Aug 2003 17:47:29 -0000	2.73
@@ -883,7 +883,10 @@
 
 	// If the command is to start a sound, stop that sound if it's already playing.
 	// This fixes some carnival music problems.
-	if (trig->command [0] == 8 && getSoundStatus(trig->command [1]))
+	// NOTE: We ONLY do this if the sound that will trigger the command is actually
+	// playing. Otherwise, there's a problem when exiting and re-entering the
+	// Bumpusville mansion. Ref Bug #780918.
+	if (trig->command [0] == 8 && getSoundStatus(trig->command [1]) && getSoundStatus (sound))
 		stopSound(trig->command [1]);
 	return 0;
 }