[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.61,1.62 simon.cpp,1.188,1.189

[Travis Howell]

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

Modified Files:
	items.cpp simon.cpp 
Log Message:

I broke simon, so revert my last change and added fixmes instead.


Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- items.cpp	19 May 2003 09:59:23 -0000	1.61
+++ items.cpp	20 May 2003 07:26:18 -0000	1.62
@@ -1445,7 +1445,8 @@
 			if (b == _vc72_var1 || b == 999) 
 				return;
 
-			if (_vc72_var1 != 0xFFFF || _vc72_var1 != 999)  {
+			//FIXME Changed if to allow midi jumping to work for now.
+			if (b != 1)  {
 				_vc70_var2 = c;
 				_vc70_var1 = 0xFFFF;
 				_vc72_var3 = 0xFFFF;
@@ -1453,8 +1454,10 @@
 				midi_play(b);
 				_vc72_var1 = b;
 			} else {
+				//FIXME This is another midi jump, not sure if variable order is correct.
 				_vc72_var3 = b;
 				_vc72_var2 = c;
+				midi.jump (b, c);
 			}
 		} else if (b == 999) {
 			_next_music_to_play = a;

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -d -r1.188 -r1.189
--- simon.cpp	20 May 2003 04:09:14 -0000	1.188
+++ simon.cpp	20 May 2003 07:26:19 -0000	1.189
@@ -5042,11 +5042,7 @@
 			return;
 
 		if (_vc72_var1 == 999) {
-			if (_game & GF_WIN) {	
-				midi.playMultipleSMF (_game_file);
-			} else {
-				midi.playXMIDI (_game_file);
-			}
+			//FIXME Original game started music at this point
 		}
 }
 
@@ -5058,6 +5054,13 @@
 	if (_game & GF_SIMON2) {        // Simon 2 music
 		midi.stop();
 		_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music - 1], SEEK_SET);
+		//FIXME The original game only loaded music file at this point
+		if (_game & GF_WIN) {	
+			midi.playMultipleSMF (_game_file);
+		} else {
+			midi.playXMIDI (_game_file);
+		}
+
 		_last_music_played = music;
 		_vc72_var1 = 999;
 		_vc70_var1 = 0xFFFF;