[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_music.cpp,1.39,1.40

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3242

Modified Files:
	dimuse_music.cpp 
Log Message:
Fixed bug #1294660, using aquadran's suggested solution.


Index: dimuse_music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_music.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- dimuse_music.cpp	30 Jul 2005 21:11:32 -0000	1.39
+++ dimuse_music.cpp	19 Sep 2005 06:49:29 -0000	1.40
@@ -193,7 +193,14 @@
 void IMuseDigital::setComiMusicState(int stateId) {
 	int l, num = -1;
 
-	if ((stateId == 0) || (stateId == 4))
+	// This happens at the beginning of Part II, but should apparently not
+	// do anything since the correct music is already playing. A left-over
+	// of some kind?
+
+	if (stateId == 4)
+		return;
+
+	if (stateId == 0)
 		stateId = 1000;
 
 	for (l = 0; _comiStateMusicTable[l].soundId != -1; l++) {