[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.279,1.280

[Travis Howell]

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

Modified Files:
	simon.cpp 
Log Message:

Make code match


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -d -r1.279 -r1.280
--- simon.cpp	2 Aug 2003 10:48:30 -0000	1.279
+++ simon.cpp	2 Aug 2003 11:04:29 -0000	1.280
@@ -3818,7 +3818,7 @@
 		if (speech_id == 0xFFFF) {
 			if (_subtitles)
 				return;
-			if (!(_bit_array[0] & 0x4000 || _bit_array[1] & 0x1000)) {
+			if (!(_bit_array[0] & 0x4000) && !(_bit_array[1] & 0x1000)) {
 				_bit_array[0] |= 0x4000;
 				_variableArray[100] = 5;
 				start_vga_code(4, 1, 0x1e, 0, 0, 0);
@@ -3828,7 +3828,7 @@
 		} else {
 			if (_subtitles && _scriptvar_2) {
 				start_vga_code(4, 2, 5, 0, 0, 0);
-				o_wait_for_vga(0xcd);
+				o_wait_for_vga(205);
 				o_kill_sprite_simon2(2, 5);
 			}
 			o_kill_sprite_simon2(2, num_1 + 2);