[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.63,1.64 simon.cpp,1.193,1.194 simon.h,1.61,1.62 vga.cpp,1.44,1.45

[Travis Howell]

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

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

Minor midi change for Jamieson630


Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- items.cpp	20 May 2003 09:25:45 -0000	1.63
+++ items.cpp	20 May 2003 15:37:02 -0000	1.64
@@ -750,10 +750,10 @@
 			break;
 
 		case 134:{
-				_vc70_var2 = 0xFFFF;
+				_vc70_var2 = -1;
 				midi.stop();
-				_last_music_played = 0xFFFF;
-				_vc72_var1 = 0xFFFF;
+				_last_music_played = -1;
+				_vc72_var1 = -1;
 			}
 			break;
 
@@ -1447,9 +1447,9 @@
 			//FIXME Changed if to allow midi jumping to work for now.
 			if (b != 1)  {
 				_vc70_var2 = c;
-				_vc70_var1 = 0xFFFF;
-				_vc72_var3 = 0xFFFF;
-				_next_music_to_play = 0xFFFF;
+				_vc70_var1 = -1;
+				_vc72_var3 = -1;
+				_next_music_to_play = -1;
 				midi_play(b);
 				_vc72_var1 = b;
 			} else {

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- simon.cpp	20 May 2003 14:34:06 -0000	1.193
+++ simon.cpp	20 May 2003 15:37:02 -0000	1.194
@@ -5303,9 +5303,9 @@
 
 		_last_music_played = music;
 		_vc72_var1 = 999;
-		_vc70_var1 = 0xFFFF;
-		_vc72_var3 = 0xFFFF;
-		_next_music_to_play = 0xFFFF;
+		_vc70_var1 = -1;
+		_vc72_var3 = -1;
+		_next_music_to_play = -1;
 	} else { // Simon 1 music
 		if (_game & GF_AMIGAS) {
 			if (_game != GAME_SIMON1CD32) {

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- simon.h	20 May 2003 14:34:07 -0000	1.61
+++ simon.h	20 May 2003 15:37:03 -0000	1.62
@@ -257,8 +257,8 @@
 	byte _video_var_9;
 
 	uint _midi_sfx;
-	uint _last_music_played;
-	uint _next_music_to_play;
+	uint16 _last_music_played;
+	uint16 _next_music_to_play;
 
 	bool _show_preposition;
 	bool _showmessage_flag;

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- vga.cpp	20 May 2003 02:33:28 -0000	1.44
+++ vga.cpp	20 May 2003 15:37:03 -0000	1.45
@@ -1692,7 +1692,7 @@
 
 	if (!_video_var_3) {
 		if (_game & GF_SIMON2) {
-			if (_next_music_to_play != 0xFFFF)
+			if (_next_music_to_play != -1)
 				playMusic(_next_music_to_play);
 		}
 	} else
@@ -1835,7 +1835,7 @@
 
 void SimonState::vc_71() {
 	// Simon2
-	if (_vc72_var3 == 0xFFFF && _vc70_var1 == 0xFFFF)
+	if (_vc72_var3 == -1 && _vc70_var1 == -1)
 		vc_skip_next_instruction();
 }