From a1daf54425a6311f8c9837a95a63c7ba73604278 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sun, 24 Jan 2010 21:11:26 +0000
Subject: SCI: never set palette for amiga games (fixes kq5 palette corruption
 at the beginning)

svn-id: r47525
---
 engines/sci/graphics/palette.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'engines/sci')

diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index 08e6b679bd..b7233b5412 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -151,7 +151,8 @@ bool SciPalette::setAmiga() {
 			_sysPalette.colors[curColor].b = (byte2 & 0x0F) * 0x11;
 		}
 		file.close();
-		setOnScreen();
+		// Directly set the palette, because setOnScreen() wont do a thing for amiga
+		_screen->setPalette(&_sysPalette);
 
 		// Create EGA to amiga table
 		for (curColor = 1; curColor < 16; curColor++) {
@@ -294,6 +295,9 @@ void SciPalette::getSys(Palette *pal) {
 void SciPalette::setOnScreen() {
 //	if (pal != &_sysPalette)
 //		memcpy(&_sysPalette,pal,sizeof(Palette));
+	// We dont change palette at all times for amiga
+	if (_resMan->getViewType() == kViewAmiga)
+		return;
 	_screen->setPalette(&_sysPalette);
 }
 
-- 
cgit v1.2.3