[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.348,1.349

[Travis Howell]

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

Modified Files:
	simon.cpp 
Log Message:

Ooops


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -d -r1.348 -r1.349
--- simon.cpp	2 Dec 2003 08:09:13 -0000	1.348
+++ simon.cpp	2 Dec 2003 08:26:32 -0000	1.349
@@ -305,7 +305,7 @@
 	_continous_vgascript = 0;
 	_draw_images_debug = 0;
 	_speech = false;
-	_subtitles = true;
+	_subtitles = false;
 	_mouse_cursor = 0;
 	_vga_var9 = 0;
 	_script_unk_1 = 0;
@@ -3095,19 +3095,11 @@
 }
 
 void SimonEngine::timer_callback() {
-//	uint32 start, end;
-
 	if (_timer_5 != 0) {
 		_sync_flag_2 = true;
 		_timer_5--;
 	} else {
-//		start = _system->get_msecs();
 		timer_proc1();
-//		end = _system->get_msecs();
-
-//		if (start + 45 < end) {
-//			_timer_5 = (uint16)( (end - start) / 45);
-//		}
 	}
 }
 
@@ -4703,7 +4695,7 @@
 	if (_game & GF_TALKIE) {
 		_speech = true;
 		// English and German versions of Simon the Sorcerer 1 don't have full subtitles
-		if (!(_game & GF_SIMON2) || _language < 2) 
+		if (!(_game & GF_SIMON2) && _language < 2) 
 			_subtitles = false;
 	} else {
 		_subtitles = true;