[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.271,1.272

[Travis Howell]

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

Modified Files:
	simon.cpp 
Log Message:

Small cleanup


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -d -r1.271 -r1.272
--- simon.cpp	30 Jul 2003 11:17:51 -0000	1.271
+++ simon.cpp	31 Jul 2003 01:59:31 -0000	1.272
@@ -2935,12 +2935,11 @@
 
 	if (_game & GF_SIMON2) {
 		if (_lock_word & 0x80E9 || _lock_word & 2)
-		return;
-	} else if (_game & GF_TALKIE) {
+			return;
+	} else {
 		if (_lock_word & 0xC0E9 || _lock_word & 2)
-		return;
-	} else 	if (_lock_word & 0x8000 || _lock_word & 0xE9 || _lock_word & 2)
-		return;
+			return;
+	}
 
 	_timer_1++;
 
@@ -2957,7 +2956,6 @@
 
 		} else {
 			_sync_flag_2 ^= 1;
-
 			if (!_sync_flag_2)
 				expire_vga_timers();
 
@@ -2969,7 +2967,6 @@
 		}
 	}
 
-	// XXX: more stuff here
 	timer_vga_sprites();
 	if (_draw_images_debug)
 		timer_vga_sprites_2();