[Scummvm-cvs-logs] CVS: scummvm/scumm palette.cpp,2.42,2.43 saveload.cpp,1.224,1.225 script_v2.cpp,2.276,2.277 scumm.cpp,1.515,1.516 scumm.h,1.627,1.628

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3441

Modified Files:
	palette.cpp saveload.cpp script_v2.cpp scumm.cpp scumm.h 
Log Message:
Add C64 palette.
Fix Zak C64. Now it is playable.


Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette.cpp,v
retrieving revision 2.42
retrieving revision 2.43
diff -u -d -r2.42 -r2.43
--- palette.cpp	14 May 2005 22:56:39 -0000	2.42
+++ palette.cpp	18 May 2005 00:46:29 -0000	2.43
@@ -31,6 +31,25 @@
 
 namespace Scumm {
 
+void ScummEngine::setupC64Palette() {
+	setPalColor( 0, 0x00, 0x00, 0x00);
+	setPalColor( 1, 0xFF, 0xFF, 0xFF);
+	setPalColor( 2, 0x99, 0x00, 0x00);
+	setPalColor( 3, 0x00, 0xff, 0xcc);
+	setPalColor( 4, 0xcc, 0x00, 0xcc);
+	setPalColor( 5, 0x44, 0xcc, 0x44);
+	setPalColor( 6, 0x11, 0x00, 0x99);
+	setPalColor( 7, 0xff, 0xff, 0x00);
+	setPalColor( 8, 0xaa, 0x55, 0x00);
+	setPalColor( 9, 0x66, 0x33, 0x00);
+	setPalColor(10, 0xff, 0x66, 0x66);
+	setPalColor(11, 0x40, 0x40, 0x40);
+	setPalColor(12, 0x80, 0x80, 0x80);
+	setPalColor(13, 0x66, 0xff, 0x66);
+	setPalColor(14, 0x77, 0x77, 0xff);
+	setPalColor(15, 0xc0, 0xc0, 0xc0);
+}
+
 void ScummEngine::setupNESPalette() {
 	setPalColor(0x00,0x24,0x24,0x24); // 0x1D
 	setPalColor(0x01,0x00,0x24,0x92);

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -d -r1.224 -r1.225
--- saveload.cpp	14 May 2005 22:56:39 -0000	1.224
+++ saveload.cpp	18 May 2005 00:46:30 -0000	1.225
@@ -266,13 +266,17 @@
 	// for backwards compatibility, and it may still prove useful if we
 	// ever add options for using different 16-colour palettes.
 	if (_version == 1) {
-		if (_gameId == GID_MANIAC)
-			if (_platform == Common::kPlatformNES)
-				setupNESPalette();
+		if (_platform == Common::kPlatformC64)
+			setupC64Palette();
+		else {
+			if (_gameId == GID_MANIAC)
+				if (_platform == Common::kPlatformNES)
+					setupNESPalette();
+				else
+					setupV1ManiacPalette();
 			else
-				setupV1ManiacPalette();
-		else
-			setupV1ZakPalette();
+				setupV1ZakPalette();
+		}
 	} else if (_features & GF_16COLOR) {
 		switch (_renderMode) {
 		case Common::kRenderEGA:

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.276
retrieving revision 2.277
diff -u -d -r2.276 -r2.277
--- script_v2.cpp	26 Apr 2005 15:52:55 -0000	2.276
+++ script_v2.cpp	18 May 2005 00:46:30 -0000	2.277
@@ -1580,6 +1580,8 @@
 	// groups of costumes it has
 	if (_platform == Common::kPlatformNES)
 		NES_loadCostumeSet(fetchScriptByte());
+	else if (_platform == Common::kPlatformC64)
+		fetchScriptByte();
 	else
 		o2_dummy();
 }

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.515
retrieving revision 1.516
diff -u -d -r1.515 -r1.516
--- scumm.cpp	15 May 2005 09:46:33 -0000	1.515
+++ scumm.cpp	18 May 2005 00:46:30 -0000	1.516
@@ -1568,13 +1568,17 @@
 		// line
 		// Original games used some kind of dynamic
 		// color table remapping between rooms
-		if (_gameId == GID_MANIAC) {
-			if (_platform == Common::kPlatformNES)
-				setupNESPalette();
-			else
-				setupV1ManiacPalette();
-		} else
-			setupV1ZakPalette();
+		if (_platform == Common::kPlatformC64)
+			setupC64Palette();
+		else {
+			if (_gameId == GID_MANIAC) {
+				if (_platform == Common::kPlatformNES)
+					setupNESPalette();
+				else
+					setupV1ManiacPalette();
+			} else
+				setupV1ZakPalette();
+		}
 	} else if (_features & GF_16COLOR) {
 		for (i = 0; i < 16; i++)
 			_shadowPalette[i] = i;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.627
retrieving revision 1.628
diff -u -d -r1.627 -r1.628
--- scumm.h	15 May 2005 09:46:34 -0000	1.627
+++ scumm.h	18 May 2005 00:46:30 -0000	1.628
@@ -967,6 +967,7 @@
 	void actorFollowCamera(int act);
 
 	const byte *getPalettePtr(int palindex, int room);
+	void setupC64Palette();
 	void setupNESPalette();
 	void setupAmigaPalette();
 	void setupHercPalette();