[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.421,1.422

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2947/simon

Modified Files:
	simon.cpp 
Log Message:

Switch warnings to debug.
Remove old commented out Simon code.


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -d -r1.421 -r1.422
--- simon.cpp	12 Feb 2004 13:33:01 -0000	1.421
+++ simon.cpp	13 Feb 2004 11:00:37 -0000	1.422
@@ -3109,24 +3109,12 @@
 	_lock_word |= 2;
 
 	if (!(_lock_word & 0x10)) {
-		// We currently use this section for both Simon1 and Simon2 games
-		// since Simon2 section causes slow down for unknown reasons.
-		//if (!(_game & GF_SIMON2)) {
-			expire_vga_timers();
+		expire_vga_timers();
+		expire_vga_timers();
+		_sync_flag_2 ^= 1;
+		_cepe_flag ^= 1;
+		if (!_cepe_flag)
 			expire_vga_timers();
-			_sync_flag_2 ^= 1;
-			_cepe_flag ^= 1;
-			if (!_cepe_flag)
-				expire_vga_timers();
-
-/*
-		} else {
-			_sync_flag_2 ^= 1;
-			if (!_sync_flag_2)
-				expire_vga_timers();
-
-		}
-*/
 
 		if (_lock_counter != 0 && !_sync_flag_2) {
 			_lock_word &= ~2;