[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.174,2.175 saveload.cpp,1.92,1.93 scumm.h,1.267,1.268 scummvm.cpp,2.280,2.281

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv30780/scumm

Modified Files:
	gfx.cpp saveload.cpp scumm.h scummvm.cpp 
Log Message:

Split the v1 palette, since there is a minor difference.


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.174
retrieving revision 2.175
diff -u -d -r2.174 -r2.175
--- gfx.cpp	14 Jul 2003 06:14:49 -0000	2.174
+++ gfx.cpp	14 Jul 2003 06:44:47 -0000	2.175
@@ -2573,7 +2573,7 @@
 	setPalColor(15, 252, 252, 252);
 }
 
-void Scumm::setupC64Palette() {
+void Scumm::setupV1ManiacPalette() {
 	setPalColor( 0,   0,   0,   0); 
 	setPalColor( 1, 252, 252, 252); 
 	setPalColor( 2, 168,   0,   0);
@@ -2590,6 +2590,25 @@
 	setPalColor(13,  84, 252,  84);
 	setPalColor(14,  84,  84, 252);
 	setPalColor(15,  84,  84,  84);
+}
+
+void Scumm::setupV1ZakPalette() {
+	setPalColor( 0,   0,   0,   0); 
+	setPalColor( 1, 252, 252, 252); 
+	setPalColor( 2, 168,   0,   0);
+	setPalColor( 3,   0, 168, 168); 
+	setPalColor( 4, 168,   0, 168); 
+	setPalColor( 5,   0, 168,   0);
+	setPalColor( 6,   0,   0, 168);
+	setPalColor( 7, 252, 252,  84);
+	setPalColor( 8, 252,  84,  84);
+	setPalColor( 9, 168,  84,   0);
+	setPalColor(10, 252,  84,  84); 
+	setPalColor(11,  84,  84,  84); 
+	setPalColor(12, 168, 168, 168);
+	setPalColor(13,  84, 252,  84);
+	setPalColor(14,  84,  84, 252);
+	setPalColor(15, 168, 168, 168);
 }
 
 /* Old palette used in Commodre 64 versions

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- saveload.cpp	11 Jul 2003 14:27:55 -0000	1.92
+++ saveload.cpp	14 Jul 2003 06:44:47 -0000	1.93
@@ -170,7 +170,10 @@
 	// ever add options for using different 16-colour palettes.
 
 	if (_version == 1) {
-		setupC64Palette();
+		if (_gameId == GID_MANIAC)
+			setupV1ManiacPalette();
+		else
+			setupV1ZakPalette();
 	} else if (_features & GF_16COLOR) {
 		if (_features & GF_AMIGA)
 			setupAmigaPalette();

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -d -r1.267 -r1.268
--- scumm.h	13 Jul 2003 15:13:43 -0000	1.267
+++ scumm.h	14 Jul 2003 06:44:47 -0000	1.268
@@ -874,7 +874,8 @@
 	const byte *getPalettePtr();
 	void setupAmigaPalette();
 	void setupEGAPalette();
-	void setupC64Palette();
+	void setupV1ManiacPalette();
+	void setupV1ZakPalette();
 	void setPalette(int pal);
 	void setPaletteFromPtr(const byte *ptr);
 	void setPaletteFromRes();

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.280
retrieving revision 2.281
diff -u -d -r2.280 -r2.281
--- scummvm.cpp	14 Jul 2003 06:00:17 -0000	2.280
+++ scummvm.cpp	14 Jul 2003 06:44:47 -0000	2.281
@@ -791,7 +791,10 @@
 	if (_version == 1) {
 		for (i = 0; i < 16; i++)
 			_shadowPalette[i] = i;
-		setupC64Palette();
+		if (_gameId == GID_MANIAC)
+			setupV1ManiacPalette();
+		else
+			setupV1ZakPalette();
 	} else if (_features & GF_16COLOR) {
 		for (i = 0; i < 16; i++)
 			_shadowPalette[i] = i;