[Scummvm-cvs-logs] CVS: scummvm/simon vga.cpp,1.91,1.92

[Travis Howell]

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

Modified Files:
	vga.cpp 
Log Message:

Only used in simon1win


Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- vga.cpp	1 Dec 2003 00:45:16 -0000	1.91
+++ vga.cpp	2 Dec 2003 05:12:49 -0000	1.92
@@ -1705,7 +1705,6 @@
 
 void SimonEngine::vc_62_palette_thing() {
 	uint i;
-	byte *vc_ptr_org = _vc_ptr;
 
 	vc_29_stop_all_sounds();
 
@@ -1724,10 +1723,11 @@
 			delay(5);
 		}
 
-		if (!(_game & GF_SIMON2)) {
+		if (_game == GAME_SIMON1WIN) {
 			uint16 params[5];						/* parameters to vc_10_draw */
 			VgaSprite *vsp;
 			VgaPointersEntry *vpe;
+			byte *vc_ptr_org = _vc_ptr;
 
 			vsp = _vga_sprites;
 			while (vsp->id != 0) {
@@ -1756,11 +1756,10 @@
 				}
 				vsp++;
 			}
+			_vc_ptr = vc_ptr_org;
 		}
 
 		dx_clear_surfaces(_video_palette_mode == 4 ? 134 : 200);
-
-		_vc_ptr = vc_ptr_org;
 	}
 	if (_game & GF_SIMON2) {
 		if (_next_music_to_play != -1)
@@ -1785,11 +1784,11 @@
 
 void SimonEngine::vc_65_palette_thing_3() {
 	// Simon2
-	_palette_color_count = 0x270;
-	_video_num_pal_colors = 0x0D0;
+	_palette_color_count = 624;
+	_video_num_pal_colors = 208;
 	if (_video_palette_mode != 4) {
-		_palette_color_count = 0x300;
-		_video_num_pal_colors = 0x100;
+		_palette_color_count = 768;
+		_video_num_pal_colors = 256;
 	}
 	_palette_color_count |= 0x8000;
 	_video_var_3 = false;