Enable alternative palettse for Amiga Monkey Island - Patch ID: 2819787

use tables for palette colors instead of code with constants

svn-id: r43696

3 files changed, 130 insertions, 203 deletions

diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp
index a596cc5b1a..2fe3f34530 100644
--- a/engines/scumm/palette.cpp
+++ b/engines/scumm/palette.cpp
@@ -55,230 +55,155 @@ uint16 ScummEngine::get16BitColor(uint8 r, uint8 g, uint8 b) {
 }
 
 void ScummEngine::resetPalette() {
+	static const byte tableC64Palette[] = {
+		0x00, 0x00, 0x00, 	0xFD, 0xFE, 0xFC, 	0xBE, 0x1A, 0x24, 	0x30, 0xE6, 0xC6,
+		0xB4, 0x1A, 0xE2, 	0x1F, 0xD2, 0x1E, 	0x21, 0x1B, 0xAE, 	0xDF, 0xF6, 0x0A,
+		0xB8, 0x41, 0x04, 	0x6A, 0x33, 0x04, 	0xFE, 0x4A, 0x57, 	0x42, 0x45, 0x40,
+		0x70, 0x74, 0x6F, 	0x59, 0xFE, 0x59, 	0x5F, 0x53, 0xFE, 	0xA4, 0xA7, 0xA2,
+
+		// Use 17 color table for v1 games to allow correct color for inventory and
+		// sentence line. Original games used some kind of dynamic color table
+		// remapping between rooms.
+		0xFF, 0x55, 0xFF
+	};
+
+	static const byte tableNESPalette[] = {
+		/*    0x1D     */
+		0x00, 0x00, 0x00, 	0x00, 0x24, 0x92, 	0x00, 0x00, 0xDB, 	0x6D, 0x49, 0xDB,
+		0x92, 0x00, 0x6D, 	0xB6, 0x00, 0x6D, 	0xB6, 0x24, 0x00, 	0x92, 0x49, 0x00,
+		0x6D, 0x49, 0x00, 	0x24, 0x49, 0x00, 	0x00, 0x6D, 0x24, 	0x00, 0x92, 0x00,
+		0x00, 0x49, 0x49, 	0x00, 0x00, 0x00, 	0x00, 0x00, 0x00, 	0x00, 0x00, 0x00,
+
+		0xB6, 0xB6, 0xB6, 	0x00, 0x6D, 0xDB, 	0x00, 0x49, 0xFF, 	0x92, 0x00, 0xFF,
+		0xB6, 0x00, 0xFF, 	0xFF, 0x00, 0x92, 	0xFF, 0x00, 0x00, 	0xDB, 0x6D, 0x00,
+		0x92, 0x6D, 0x00, 	0x24, 0x92, 0x00, 	0x00, 0x92, 0x00, 	0x00, 0xB6, 0x6D,
+							/*    0x00     */
+		0x00, 0x92, 0x92, 	0x6D, 0x6D, 0x6D, 	0x00, 0x00, 0x00, 	0x00, 0x00, 0x00,
+
+		0xFF, 0xFF, 0xFF, 	0x6D, 0xB6, 0xFF, 	0x92, 0x92, 0xFF, 	0xDB, 0x6D, 0xFF,
+		0xFF, 0x00, 0xFF, 	0xFF, 0x6D, 0xFF, 	0xFF, 0x92, 0x00, 	0xFF, 0xB6, 0x00,
+		0xDB, 0xDB, 0x00, 	0x6D, 0xDB, 0x00, 	0x00, 0xFF, 0x00, 	0x49, 0xFF, 0xDB,
+		0x00, 0xFF, 0xFF, 	0x49, 0x49, 0x49, 	0x00, 0x00, 0x00, 	0x00, 0x00, 0x00,
+
+		0xFF, 0xFF, 0xFF, 	0xB6, 0xDB, 0xFF, 	0xDB, 0xB6, 0xFF, 	0xFF, 0xB6, 0xFF,
+		0xFF, 0x92, 0xFF, 	0xFF, 0xB6, 0xB6, 	0xFF, 0xDB, 0x92, 	0xFF, 0xFF, 0x49,
+		0xFF, 0xFF, 0x6D, 	0xB6, 0xFF, 0x49, 	0x92, 0xFF, 0x6D, 	0x49, 0xFF, 0xDB,
+		0x92, 0xDB, 0xFF, 	0x92, 0x92, 0x92, 	0x00, 0x00, 0x00, 	0x00, 0x00, 0x00
+	};
+
+	static const byte tableAmigaPalette[] = {
+		0x00, 0x00, 0x00, 	0x00, 0x00, 0xBB, 	0x00, 0xBB, 0x00, 	0x00, 0xBB, 0xBB,
+		0xBB, 0x00, 0x00, 	0xBB, 0x00, 0xBB, 	0xBB, 0x77, 0x00, 	0xBB, 0xBB, 0xBB,
+		0x77, 0x77, 0x77, 	0x77, 0x77, 0xFF, 	0x00, 0xFF, 0x00, 	0x00, 0xFF, 0xFF,
+		0xFF, 0x88, 0x88, 	0xFF, 0x00, 0xFF, 	0xFF, 0xFF, 0x00, 	0xFF, 0xFF, 0xFF
+	};
+
+	static const byte tableAmigaMIPalette[] = {
+		0x00, 0x00, 0x00, 	0x00, 0x00, 0xAA, 	0x00, 0x88, 0x22, 	0x00, 0x66, 0x77,
+		0xBB, 0x66, 0x66, 	0xAA, 0x22, 0xAA, 	0x88, 0x55, 0x22, 	0x77, 0x77, 0x77,
+		0x33, 0x33, 0x33, 	0x22, 0x55, 0xDD, 	0x22, 0xDD, 0x44, 	0x00, 0xCC, 0xFF,
+		0xFF, 0x99, 0x99, 	0xFF, 0x55, 0xFF, 	0xFF, 0xFF, 0x77, 	0xFF, 0xFF, 0xFF
+	};
+
+	static const byte tableEGAPalette[] = {
+		0x00, 0x00, 0x00, 	0x00, 0x00, 0xAA, 	0x00, 0xAA, 0x00, 	0x00, 0xAA, 0xAA,
+		0xAA, 0x00, 0x00, 	0xAA, 0x00, 0xAA, 	0xAA, 0x55, 0x00, 	0xAA, 0xAA, 0xAA,
+		0x55, 0x55, 0x55, 	0x55, 0x55, 0xFF, 	0x55, 0xFF, 0x55, 	0x55, 0xFF, 0xFF,
+		0xFF, 0x55, 0x55, 	0xFF, 0x55, 0xFF, 	0xFF, 0xFF, 0x55, 	0xFF, 0xFF, 0xFF
+	};
+
+	static const byte tableV1Palette[] = {
+		0x00, 0x00, 0x00, 	0xFF, 0xFF, 0xFF, 	0xAA, 0x00, 0x00, 	0x00, 0xAA, 0xAA,
+		0xAA, 0x00, 0xAA, 	0x00, 0xAA, 0x00, 	0x00, 0x00, 0xAA, 	0xFF, 0xFF, 0x55,
+		0xFF, 0x55, 0x55, 	0xAA, 0x55, 0x00, 	0xFF, 0x55, 0x55, 	0x55, 0x55, 0x55,
+		0xAA, 0xAA, 0xAA, 	0x55, 0xFF, 0x55, 	0x55, 0x55, 0xFF, 	0x55, 0x55, 0x55,
+
+		0xFF, 0x55, 0xFF
+	};
+
+	static const byte tableCGAPalette[] = {
+		0x00, 0x00, 0x00, 	0x00, 0xA8, 0xA8,	0xA8, 0x00, 0xA8, 	0xA8, 0xA8, 0xA8
+	};
+
+	static const byte tableHercAPalette[] = {
+		0x00, 0x00, 0x00, 	0xAE, 0x69, 0x38
+	};
+
+	static const byte tableHercGPalette[] = {
+		0x00, 0x00, 0x00, 	0x00, 0xFF, 0x00
+	};
+
 	if (_game.version <= 1) {
 		if (_game.platform == Common::kPlatformApple2GS) {
 			// TODO: unique palette?
-			setC64Palette();
+			setPaletteFromTable(tableC64Palette, sizeof(tableC64Palette) / 3);
 		} else if (_game.platform == Common::kPlatformC64) {
-			setC64Palette();
+			setPaletteFromTable(tableC64Palette, sizeof(tableC64Palette) / 3);
 		} else if (_game.platform == Common::kPlatformNES) {
-			setNESPalette();
+			setPaletteFromTable(tableNESPalette, sizeof(tableNESPalette) / 3);
 		} else {
-			setV1Palette();
+			setPaletteFromTable(tableV1Palette, sizeof(tableV1Palette) / 3);
+			if (_game.id == GID_ZAK)
+				setPalColor(15, 170, 170, 170);
 		}
 	} else if (_game.features & GF_16COLOR) {
+		bool setupCursor = false;
+
 		switch (_renderMode) {
 		case Common::kRenderEGA:
-			setEGAPalette();
+			setPaletteFromTable(tableEGAPalette, sizeof(tableEGAPalette) / 3);
 			break;
 
 		case Common::kRenderAmiga:
-			setAmigaPalette();
+			setPaletteFromTable(tableAmigaPalette, sizeof(tableAmigaPalette) / 3);
 			break;
 
 		case Common::kRenderCGA:
-			setCGAPalette();
+			setPaletteFromTable(tableCGAPalette, sizeof(tableCGAPalette) / 3);
+			setupCursor = true;
 			break;
 
 		case Common::kRenderHercA:
+			setPaletteFromTable(tableHercAPalette, sizeof(tableHercAPalette) / 3);
+			setupCursor = true;
+			break;
+
 		case Common::kRenderHercG:
-			setHercPalette();
+			setPaletteFromTable(tableHercGPalette, sizeof(tableHercGPalette) / 3);
+			setupCursor = true;
 			break;
 
 		default:
 			if ((_game.platform == Common::kPlatformAmiga) || (_game.platform == Common::kPlatformAtariST))
-				setAmigaPalette();
+				setPaletteFromTable(tableAmigaPalette, sizeof(tableAmigaPalette) / 3);
 			else
-				setEGAPalette();
+				setPaletteFromTable(tableEGAPalette, sizeof(tableEGAPalette) / 3);
+		}
+		if (setupCursor) {
+			// Setup cursor palette
+			setPalColor( 7, 170, 170, 170);
+			setPalColor( 8,  85,  85,  85);
+			setPalColor(15, 255, 255, 255);
 		}
-	} else
-		setDirtyColors(0, 255);
-}
-
-void ScummEngine::setC64Palette() {
-	setPalColor( 0, 0x00, 0x00, 0x00);
-	setPalColor( 1, 0xFD, 0xFE, 0xFC);
-	setPalColor( 2, 0xBE, 0x1A, 0x24);
-	setPalColor( 3, 0x30, 0xE6, 0xC6);
-	setPalColor( 4, 0xB4, 0x1A, 0xE2);
-	setPalColor( 5, 0x1F, 0xD2, 0x1E);
-	setPalColor( 6, 0x21, 0x1B, 0xAE);
-	setPalColor( 7, 0xDF, 0xF6, 0x0A);
-	setPalColor( 8, 0xB8, 0x41, 0x04);
-	setPalColor( 9, 0x6A, 0x33, 0x04);
-	setPalColor(10, 0xFE, 0x4A, 0x57);
-	setPalColor(11, 0x42, 0x45, 0x40);
-	setPalColor(12, 0x70, 0x74, 0x6F);
-	setPalColor(13, 0x59, 0xFE, 0x59);
-	setPalColor(14, 0x5F, 0x53, 0xFE);
-	setPalColor(15, 0xA4, 0xA7, 0xA2);
-
-	// Use 17 color table for v1 games to allow correct color for inventory and
-	// sentence line. Original games used some kind of dynamic color table
-	// remapping between rooms.
-	setPalColor(16, 255,  85, 255);
-}
-
-void ScummEngine::setNESPalette() {
-	setPalColor(0x00,0x00,0x00,0x00); // 0x1D
-	setPalColor(0x01,0x00,0x24,0x92);
-	setPalColor(0x02,0x00,0x00,0xDB);
-	setPalColor(0x03,0x6D,0x49,0xDB);
-	setPalColor(0x04,0x92,0x00,0x6D);
-	setPalColor(0x05,0xB6,0x00,0x6D);
-	setPalColor(0x06,0xB6,0x24,0x00);
-	setPalColor(0x07,0x92,0x49,0x00);
-	setPalColor(0x08,0x6D,0x49,0x00);
-	setPalColor(0x09,0x24,0x49,0x00);
-	setPalColor(0x0A,0x00,0x6D,0x24);
-	setPalColor(0x0B,0x00,0x92,0x00);
-	setPalColor(0x0C,0x00,0x49,0x49);
-	setPalColor(0x0D,0x00,0x00,0x00);
-	setPalColor(0x0E,0x00,0x00,0x00);
-	setPalColor(0x0F,0x00,0x00,0x00);
-
-	setPalColor(0x10,0xB6,0xB6,0xB6);
-	setPalColor(0x11,0x00,0x6D,0xDB);
-	setPalColor(0x12,0x00,0x49,0xFF);
-	setPalColor(0x13,0x92,0x00,0xFF);
-	setPalColor(0x14,0xB6,0x00,0xFF);
-	setPalColor(0x15,0xFF,0x00,0x92);
-	setPalColor(0x16,0xFF,0x00,0x00);
-	setPalColor(0x17,0xDB,0x6D,0x00);
-	setPalColor(0x18,0x92,0x6D,0x00);
-	setPalColor(0x19,0x24,0x92,0x00);
-	setPalColor(0x1A,0x00,0x92,0x00);
-	setPalColor(0x1B,0x00,0xB6,0x6D);
-	setPalColor(0x1C,0x00,0x92,0x92);
-	setPalColor(0x1D,0x6D,0x6D,0x6D); // 0x00
-	setPalColor(0x1E,0x00,0x00,0x00);
-	setPalColor(0x1F,0x00,0x00,0x00);
-
-	setPalColor(0x20,0xFF,0xFF,0xFF);
-	setPalColor(0x21,0x6D,0xB6,0xFF);
-	setPalColor(0x22,0x92,0x92,0xFF);
-	setPalColor(0x23,0xDB,0x6D,0xFF);
-	setPalColor(0x24,0xFF,0x00,0xFF);
-	setPalColor(0x25,0xFF,0x6D,0xFF);
-	setPalColor(0x26,0xFF,0x92,0x00);
-	setPalColor(0x27,0xFF,0xB6,0x00);
-	setPalColor(0x28,0xDB,0xDB,0x00);
-	setPalColor(0x29,0x6D,0xDB,0x00);
-	setPalColor(0x2A,0x00,0xFF,0x00);
-	setPalColor(0x2B,0x49,0xFF,0xDB);
-	setPalColor(0x2C,0x00,0xFF,0xFF);
-	setPalColor(0x2D,0x49,0x49,0x49);
-	setPalColor(0x2E,0x00,0x00,0x00);
-	setPalColor(0x2F,0x00,0x00,0x00);
-
-	setPalColor(0x30,0xFF,0xFF,0xFF);
-	setPalColor(0x31,0xB6,0xDB,0xFF);
-	setPalColor(0x32,0xDB,0xB6,0xFF);
-	setPalColor(0x33,0xFF,0xB6,0xFF);
-	setPalColor(0x34,0xFF,0x92,0xFF);
-	setPalColor(0x35,0xFF,0xB6,0xB6);
-	setPalColor(0x36,0xFF,0xDB,0x92);
-	setPalColor(0x37,0xFF,0xFF,0x49);
-	setPalColor(0x38,0xFF,0xFF,0x6D);
-	setPalColor(0x39,0xB6,0xFF,0x49);
-	setPalColor(0x3A,0x92,0xFF,0x6D);
-	setPalColor(0x3B,0x49,0xFF,0xDB);
-	setPalColor(0x3C,0x92,0xDB,0xFF);
-	setPalColor(0x3D,0x92,0x92,0x92);
-	setPalColor(0x3E,0x00,0x00,0x00);
-	setPalColor(0x3F,0x00,0x00,0x00);
-}
-
-void ScummEngine::setAmigaPalette() {
-	setPalColor( 0,   0,   0,   0);
-	setPalColor( 1,   0,   0, 187);
-	setPalColor( 2,   0, 187,   0);
-	setPalColor( 3,   0, 187, 187);
-	setPalColor( 4, 187,   0,   0);
-	setPalColor( 5, 187,   0, 187);
-	setPalColor( 6, 187, 119,   0);
-	setPalColor( 7, 187, 187, 187);
-	setPalColor( 8, 119, 119, 119);
-	setPalColor( 9, 119, 119, 255);
-	setPalColor(10,   0, 255,   0);
-	setPalColor(11,   0, 255, 255);
-	setPalColor(12, 255, 136, 136);
-	setPalColor(13, 255,   0, 255);
-	setPalColor(14, 255, 255,   0);
-	setPalColor(15, 255, 255, 255);
-}
-
-void ScummEngine::setHercPalette() {
-	setPalColor( 0,   0,   0,   0);
-
-	if (_renderMode == Common::kRenderHercA)
-		setPalColor( 1, 0xAE, 0x69, 0x38);
-	else
-		setPalColor( 1, 0x00, 0xFF, 0x00);
-
-	// Setup cursor palette
-	setPalColor( 7, 170, 170, 170);
-	setPalColor( 8,  85,  85,  85);
-	setPalColor(15, 255, 255, 255);
-}
-
-void ScummEngine::setCGAPalette() {
-	setPalColor( 0,   0,   0,   0);
-	setPalColor( 1,   0, 168, 168);
-	setPalColor( 2, 168,   0, 168);
-	setPalColor( 3, 168, 168, 168);
-
-	// Setup cursor palette
-	setPalColor( 7, 170, 170, 170);
-	setPalColor( 8,  85,  85,  85);
-	setPalColor(15, 255, 255, 255);
-}
 
-void ScummEngine::setEGAPalette() {
-	setPalColor( 0,   0,   0,   0);
-	setPalColor( 1,   0,   0, 170);
-	setPalColor( 2,   0, 170,   0);
-	setPalColor( 3,   0, 170, 170);
-	setPalColor( 4, 170,   0,   0);
-	setPalColor( 5, 170,   0, 170);
-	setPalColor( 6, 170,  85,   0);
-	setPalColor( 7, 170, 170, 170);
-	setPalColor( 8,  85,  85,  85);
-	setPalColor( 9,  85,  85, 255);
-	setPalColor(10,  85, 255,  85);
-	setPalColor(11,  85, 255, 255);
-	setPalColor(12, 255,  85,  85);
-	setPalColor(13, 255,  85, 255);
-	setPalColor(14, 255, 255,  85);
-	setPalColor(15, 255, 255, 255);
+	} else {
+		if ((_game.platform == Common::kPlatformAmiga) && _game.version == 4) {
+			// if rendermode is set to EGA we use the full palette from the resources
+			// else we initialise and then lock down the first 16 colors.
+			if (_renderMode != Common::kRenderEGA)
+				setPaletteFromTable(tableAmigaMIPalette, sizeof(tableAmigaMIPalette) / 3);
+		}
+		setDirtyColors(0, 255);
+	}
 }
 
-void ScummEngine::setV1Palette() {
-	setPalColor( 0,   0,   0,   0);
-	setPalColor( 1, 255, 255, 255);
-	setPalColor( 2, 170,   0,   0);
-	setPalColor( 3,   0, 170, 170);
-	setPalColor( 4, 170,   0, 170);
-	setPalColor( 5,   0, 170,   0);
-	setPalColor( 6,   0,   0, 170);
-	setPalColor( 7, 255, 255,  85);
-	setPalColor( 8, 255,  85,  85);
-	setPalColor( 9, 170,  85,   0);
-	setPalColor(10, 255,  85,  85);
-	setPalColor(11,  85,  85,  85);
-	setPalColor(12, 170, 170, 170);
-	setPalColor(13,  85, 255,  85);
-	setPalColor(14,  85,  85, 255);
-
-	if (_game.id == GID_ZAK)
-		setPalColor(15, 170, 170, 170);
-	else
-		setPalColor(15,  85,  85,  85);
-
-	setPalColor(16, 255,  85, 255);
+void ScummEngine::setPaletteFromTable(const byte *ptr, int numcolor, int index) {
+	for ( ; numcolor > 0; --numcolor, ++index, ptr += 3)
+		setPalColor( index, ptr[0], ptr[1], ptr[2]);
 }
 
 void ScummEngine::setPaletteFromPtr(const byte *ptr, int numcolor) {
+	int firstIndex = 0;
 	int i;
 	byte *dest, r, g, b;
 
@@ -298,7 +223,14 @@ void ScummEngine::setPaletteFromPtr(const byte *ptr, int numcolor) {
 
 	dest = _currentPalette;
 
-	for (i = 0; i < numcolor; i++) {
+	// Test for Amiga Monkey Island and EGA Mode unset, if true then skip the first 16 colors.
+	if ((_game.platform == Common::kPlatformAmiga) && _game.version == 4 && _renderMode != Common::kRenderEGA) {
+		firstIndex = 16;
+		dest += 3 * 16;
+		ptr += 3 * 16;
+	}
+
+	for (i = firstIndex; i < numcolor; i++) {
 		r = *ptr++;
 		g = *ptr++;
 		b = *ptr++;
@@ -323,7 +255,7 @@ void ScummEngine::setPaletteFromPtr(const byte *ptr, int numcolor) {
 		memcpy(_darkenPalette, _currentPalette, 768);
 	}
 
-	setDirtyColors(0, numcolor - 1);
+	setDirtyColors(firstIndex, numcolor - 1);
 }
 
 void ScummEngine::setDirtyColors(int min, int max) {
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 9f3ebb8053..af6b9278c6 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -499,7 +499,9 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
 	case Common::kRenderCGA:
 	case Common::kRenderEGA:
 	case Common::kRenderAmiga:
-		if ((_game.version >= 4 && !(_game.features & GF_16COLOR)) || (_game.features & GF_OLD256))
+		if ((_game.version >= 4 && !(_game.features & GF_16COLOR) 
+			&& !(_game.platform == Common::kPlatformAmiga && _renderMode == Common::kRenderEGA))
+			|| (_game.features & GF_OLD256))
 			_renderMode = Common::kRenderDefault;
 		break;
 
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 7d2bf3336a..6866b17668 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -1029,14 +1029,7 @@ protected:
 
 	const byte *getPalettePtr(int palindex, int room);
 
-	void setC64Palette();
-	void setNESPalette();
-	void setAmigaPalette();
-	void setHercPalette();
-	void setCGAPalette();
-	void setEGAPalette();
-	void setV1Palette();
-
+	void setPaletteFromTable(const byte *ptr, int numcolor, int firstIndex = 0);
 	void resetPalette();
 
 	void setCurrentPalette(int pal);