[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.224,1.225

[Travis Howell]

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

Modified Files:
	simon.cpp 
Log Message:

Correct simon2 timing
Remove unused function


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -d -r1.224 -r1.225
--- simon.cpp	29 May 2003 21:45:25 -0000	1.224
+++ simon.cpp	30 May 2003 05:39:14 -0000	1.225
@@ -2975,15 +2975,6 @@
 	}
 }
 
-void SimonState::checkTimerCallback() {
-	if (_invoke_timer_callback && !_in_callback) {
-		_in_callback = true;
-		_invoke_timer_callback = 0;
-		timer_callback();
-		_in_callback = false;
-	}
-}
-
 void SimonState::fcs_setTextColor(FillOrCopyStruct *fcs, uint value) {
 	fcs->text_color = value;
 }
@@ -4447,7 +4438,14 @@
 
 	uint32 start = _system->get_msecs();
 	uint32 cur = start;
-	const uint vga_period = _fast_mode ? 10 : 50;
+	uint vga_period;
+
+	if (_fast_mode)
+	 	vga_period = 10;
+	else if (_game & GF_SIMON2)
+		vga_period = 40;
+	else
+		vga_period = 45;
 
 	_rnd.getRandomNumber(2);