[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.99,1.100 vga.cpp,1.15,1.16

[Travis Howell]

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

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

Add work around to allow vc_65 to be enabled


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- simon.cpp	28 Nov 2002 00:22:24 -0000	1.99
+++ simon.cpp	28 Nov 2002 05:52:55 -0000	1.100
@@ -4428,13 +4428,15 @@
 void SimonState::realizePalette()
 {
 	if (_palette_color_count & 0x8000) {
-		error("_palette_color_count&0x8000");
-	}
+		warning("realizePalette subroutine unimplemented");
+		_palette_color_count = 0;
+	} else {
 	_video_var_9 = false;
 	memcpy(_palette_backup, _palette, 256 * 4);
 
 	_system->set_palette(_palette, 0, _palette_color_count);
 	_palette_color_count = 0;
+	}
 
 }
 

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- vga.cpp	28 Nov 2002 00:22:24 -0000	1.15
+++ vga.cpp	28 Nov 2002 05:52:55 -0000	1.16
@@ -1864,15 +1864,14 @@
 
 void SimonState::vc_65()
 {																// Simon2
-	warning("vc_65 unimplemented");
-	//_palette_color_count = 0x270;
-	//_video_num_pal_colors = 0x0D0;
-	//if (_video_palette_mode != 4) {
-		//_palette_color_count = 0x300;
-		//_video_num_pal_colors = 0x100;
-	//}
-	//_palette_color_count |= 0x8000;
-	//_video_var_3 = false;
+	_palette_color_count = 0x270;
+	_video_num_pal_colors = 0x0D0;
+	if (_video_palette_mode != 4) {
+		_palette_color_count = 0x300;
+		_video_num_pal_colors = 0x100;
+	}
+	_palette_color_count |= 0x8000;
+	_video_var_3 = false;
 }
 
 void SimonState::vc_66()