[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.169,2.170 scumm.h,1.264,1.265 scummvm.cpp,2.270,2.271

[Travis Howell]

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

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

Add amiga pallete for Amiga versions


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.169
retrieving revision 2.170
diff -u -d -r2.169 -r2.170
--- gfx.cpp	6 Jul 2003 10:01:23 -0000	2.169
+++ gfx.cpp	11 Jul 2003 09:38:46 -0000	2.170
@@ -2527,6 +2527,25 @@
 #pragma mark --- Palette ---
 #pragma mark -
 
+void Scumm::setupAmigaPalette() {
+	setPalColor( 0,   0,   0,   0);
+	setPalColor( 1,   0,   0, 204);
+	setPalColor( 2,   0, 204,   0);
+	setPalColor( 3,   0, 204, 204);
+	setPalColor( 4, 204,   0,   0);
+	setPalColor( 5, 204,   0, 204);
+	setPalColor( 6, 204, 102,   0);
+	setPalColor( 7, 204, 204, 204);
+	setPalColor( 8, 102, 102, 102);
+	setPalColor( 9, 102, 102, 255);
+	setPalColor(10,  0,  255,   0);
+	setPalColor(11,   0, 255, 255);
+	setPalColor(12, 255, 153, 153);
+	setPalColor(13, 255,   0, 255);
+	setPalColor(14, 255, 255,   0);
+	setPalColor(15, 255, 255, 255);
+}
+
 void Scumm::setupEGAPalette() {
 	setPalColor( 0,   0,   0,   0);
 	setPalColor( 1,   0,   0, 168);
@@ -2534,16 +2553,14 @@
 	setPalColor( 3,   0, 168, 168);
 //	setPalColor( 4, 168,   0,   0); // prev value
 	setPalColor( 4, 189,   0,   0);
-	setPalColor( 5, 168,   0, 168); // prev value
-//	setPalColor( 5, 189,   0, 189); // Amiga value
+	setPalColor( 5, 168,   0, 168); 
 	setPalColor( 6, 168,  84,   0);
 	setPalColor( 7, 168, 168, 168);
 	setPalColor( 8,  84,  84,  84);
 	setPalColor( 9,  84,  84, 252);
 	setPalColor(10,  84, 252,  84);
 	setPalColor(11,  84, 252, 252);
-	setPalColor(12, 252,  84,  84); // PC
-//	setPalColor(12, 252, 144, 144); // Amiga value gives nicer skin colour
+	setPalColor(12, 252,  84,  84);
 	setPalColor(13, 252,  84, 252);
 	setPalColor(14, 252, 252,  84);
 	setPalColor(15, 252, 252, 252);

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -d -r1.264 -r1.265
--- scumm.h	6 Jul 2003 16:51:21 -0000	1.264
+++ scumm.h	11 Jul 2003 09:38:46 -0000	1.265
@@ -870,6 +870,7 @@
 	void actorFollowCamera(int act);
 
 	const byte *getPalettePtr();
+	void setupAmigaPalette();
 	void setupEGAPalette();
 	void setupC64Palette();
 	void setPalette(int pal);

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.270
retrieving revision 2.271
diff -u -d -r2.270 -r2.271
--- scummvm.cpp	8 Jul 2003 18:09:22 -0000	2.270
+++ scummvm.cpp	11 Jul 2003 09:38:46 -0000	2.271
@@ -783,6 +783,10 @@
 		for (i = 0; i < 16; i++)
 			_shadowPalette[i] = i;
 		setupC64Palette();
+	} else if (_features & GF_AMIGA) {
+		for (i = 0; i < 16; i++)
+			_shadowPalette[i] = i;
+		setupAmigaPalette();
 	} else if (_features & GF_16COLOR) {
 		for (i = 0; i < 16; i++)
 			_shadowPalette[i] = i;