From 88c2ef94d2ce7569ebb5c85092602391703ea6d8 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Fri, 11 Jul 2003 10:13:42 +0000
Subject: Using Amiga palette with 16 color Amiga versions only

svn-id: r8905
---
 scumm/scummvm.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'scumm')

diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 366dd63348..9179dd86ab 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -783,14 +783,16 @@ void Scumm::scummInit() {
 		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) {
-- 
cgit v1.2.3