[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.11,1.12

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv5144/simon

Modified Files:
	items.cpp 
Log Message:

Add another work around and some fixme comments


Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- items.cpp	7 Nov 2002 09:08:08 -0000	1.11
+++ items.cpp	7 Nov 2002 10:42:35 -0000	1.12
@@ -1609,6 +1609,8 @@
 
 		warning("o_unk_127(%d,%d,%d) not implemented properly", a, b, c);
 
+		//FIXME simon 2 attempts to use music track 93 in ending sequences 
+		// which doesn't exist so prevent that happening
 		if ((a != _last_music_played) && (a < 93)) {
 			_last_music_played = a;
 			playMusic(a);
@@ -1616,6 +1618,11 @@
 	} else {
 		uint a = getVarOrWord();
 		/*uint b = */ getVarOrWord();
+
+		//FIXME music track 12 uses a different and unknown format
+		// Using music in next area as temporary work around
+		if (a == 12)
+			a=0;
 
 		if (a != _last_music_played) {
 			_last_music_played = a;