[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.271,2.272

[Travis Howell]

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

Modified Files:
	scummvm.cpp 
Log Message:

Using Amiga palette with 16 color Amiga versions only


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.271
retrieving revision 2.272
diff -u -d -r2.271 -r2.272
--- scummvm.cpp	11 Jul 2003 09:38:46 -0000	2.271
+++ scummvm.cpp	11 Jul 2003 10:13:42 -0000	2.272
@@ -783,14 +783,16 @@
 		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;
-		setupEGAPalette();
+		if (_features & GF_AMIGA) {
+			for (i = 0; i < 16; i++)
+				_shadowPalette[i] = i;
+			setupAmigaPalette();
+		} else {
+			for (i = 0; i < 16; i++)
+				_shadowPalette[i] = i;
+			setupEGAPalette();
+		}
 	}
 
 	if (_version <= 2) {