[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.373,1.374 simon.h,1.111,1.112

[Travis Howell]

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

Modified Files:
	simon.cpp simon.h 
Log Message:

Remove slow motion option.
Add slow_down option for config file instead for now.


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -d -r1.373 -r1.374
--- simon.cpp	18 Dec 2003 09:10:46 -0000	1.373
+++ simon.cpp	18 Dec 2003 09:36:17 -0000	1.374
@@ -323,7 +323,7 @@
 	_in_callback = 0;
 	_cepe_flag = 0;
 	_copy_partial_mode = 0;
-	_slow_mode = 0;
+	_speed = 1;
 	_fast_mode = 0;
 	_dx_use_3_or_4_for_lock = 0;
 
@@ -543,6 +543,9 @@
 	_language = Common::parseLanguage(ConfMan.get("language"));
 	_subtitles = ConfMan.getBool("subtitles");
 
+	if (ConfMan.hasKey("slow_down") && ConfMan.getInt("slow_down") >= 1)
+		_speed = ConfMan.getInt("slow_down");
+
 	_system->init_size(320, 200);
 
 	// FIXME Use auto dirty rects cleanup code to reduce CPU usage
@@ -4846,14 +4849,12 @@
 	uint32 cur = start;
 	uint this_delay, vga_period;
 
-	if (_slow_mode)
-		vga_period = 500;
-	else if (_fast_mode)
+	if (_fast_mode)
 	 	vga_period = 10;
 	else if (_game & GF_SIMON2)
-		vga_period = 45;
+		vga_period = 45 * _speed;
 	else
-		vga_period = 50;
+		vga_period = 50 * _speed;
 
 	_rnd.getRandomNumber(2);
 
@@ -4894,10 +4895,8 @@
 						GUI::Dialog *_aboutDialog;
 						_aboutDialog = new GUI::AboutDialog();
 						_aboutDialog->runModal();
-					} else if (event.kbd.keycode == 'f') {
+					} else if (event.kbd.keycode == 'f')
 						_fast_mode ^= 1;
-					} else if  (event.kbd.keycode == 's')
-						_slow_mode ^= 1;
 				}
 				// Make sure backspace works right (this fixes a small issue on OS X)
 				if (event.kbd.keycode == 8)
@@ -4935,10 +4934,7 @@
 			break;
 
 		{
-			if (_slow_mode)
-				this_delay = 200;
-			else
-				this_delay = _fast_mode ? 1 : 20;
+			this_delay = _fast_mode ? 1 : 20 * _speed;
 			if (this_delay > amount)
 				this_delay = amount;
 			_system->delay_msecs(this_delay);

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- simon.h	16 Dec 2003 05:04:39 -0000	1.111
+++ simon.h	18 Dec 2003 09:36:17 -0000	1.112
@@ -186,7 +186,7 @@
 	bool _in_callback;
 	bool _cepe_flag;
 	byte _copy_partial_mode;
-	bool _slow_mode;
+	uint _speed;
 	bool _fast_mode;
 	bool _dx_use_3_or_4_for_lock;