[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.71,1.72

Jamieson Christian jamieson630 at users.sourceforge.net
Wed May 21 17:01:06 CEST 2003


Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv21337/scummvm/simon

Modified Files:
	items.cpp 
Log Message:
Fixed premature music load in Simon 2

Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- items.cpp	21 May 2003 06:13:46 -0000	1.71
+++ items.cpp	22 May 2003 00:00:42 -0000	1.72
@@ -1445,12 +1445,10 @@
 		int loop = getVarOrByte();
 
 		midi.setLoop (loop != 0);
-		if (_last_music_played != music) {
-			loadMusic (music);
-			_last_music_played = music;
-			_next_music_to_play = -1;
-		}
-		midi.startTrack (track);
+		if (_last_music_played != music)
+			_next_music_to_play = music;
+		else 
+			midi.startTrack (track);
 	} else {
 		if (music != _last_music_played) {
 			_last_music_played = music;





More information about the Scummvm-git-logs mailing list