[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.124,1.125 vga.cpp,1.26,1.27

[Travis Howell]

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

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

Fix some comments and add missing variable change


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- simon.cpp	19 Dec 2002 14:45:14 -0000	1.124
+++ simon.cpp	19 Dec 2002 15:46:02 -0000	1.125
@@ -2650,7 +2650,10 @@
 	if (_game & GAME_SIMON2) {
 		if (_lock_word & 0x80E9 || _lock_word & 2)
 		return;
-	} else if (_lock_word & 0xC0E9 || _lock_word & 2)
+	} else if (_game & GAME_TALKIE) {
+		if (_lock_word & 0xC0E9 || _lock_word & 2)
+		return;
+	} else 	if (_lock_word & 0x8000 || _lock_word & 0xE9 || _lock_word & 2)
 		return;
 
 	_timer_1++;
@@ -2680,6 +2683,7 @@
 		}
 	}
 
+	/* XXX: more stuff here */
 	timer_vga_sprites();
 #ifdef DRAW_IMAGES_DEBUG
 	timer_vga_sprites_2();
@@ -2695,10 +2699,8 @@
 		_copy_partial_mode = 0;
 	}
 
-	/* XXX: more stuff here */
 	if (_video_var_8) {
 		handle_mouse_moved();
-		/* XXX: more stuff here */
 		dx_update_screen_and_palette();
 		_sync_flag_1 = false;
 		_video_var_8 = false;

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- vga.cpp	14 Dec 2002 15:56:17 -0000	1.26
+++ vga.cpp	19 Dec 2002 15:46:02 -0000	1.27
@@ -1388,6 +1388,7 @@
 
 void SimonState::vc_36_saveload_thing()
 {
+	_video_var_8 = false;
 	uint vga_res = vc_read_next_word();
 	uint mode = vc_read_next_word();