[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.59,1.60 vga.cpp,1.40,1.41

[Travis Howell]

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

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

Minor correction to last commit


Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- items.cpp	19 May 2003 09:41:28 -0000	1.59
+++ items.cpp	19 May 2003 09:47:33 -0000	1.60
@@ -1447,11 +1447,10 @@
 
 			if (_vc72_var1 != 0xFFFF || _vc72_var1 != 999)  {
 				_vc70_var2 = c;
-				_vc70_var1 = 0xffff;
-				_vc72_var3 = 0xffff;
-				_next_music_to_play = 0xffff;
-				if (!(_music_paused))
-					midi_play(b);
+				_vc70_var1 = 0xFFFF;
+				_vc72_var3 = 0xFFFF;
+				_next_music_to_play = 0xFFFF;
+				midi_play(b);
 				_vc72_var1 = b;
 			} else {
 				_vc72_var3 = b;

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- vga.cpp	19 May 2003 09:41:28 -0000	1.40
+++ vga.cpp	19 May 2003 09:47:33 -0000	1.41
@@ -1692,7 +1692,7 @@
 
 	if (!_video_var_3) {
 		if (_game & GF_SIMON2) {
-			if (_next_music_to_play != 0xffff)
+			if (_next_music_to_play != 0xFFFF)
 				playMusic(999, _next_music_to_play);
 		}
 	} else