From 4ea4172cbad466738836f7be8ebdcad4eabd0bb9 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 26 Aug 2011 05:51:08 +0200
Subject: SCUMM: Implement proper Indy4 Amiga palette handling.

This should fix incorrect text colors in some scenes.
---
 engines/scumm/room.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'engines/scumm/room.cpp')

diff --git a/engines/scumm/room.cpp b/engines/scumm/room.cpp
index 8962a0e971..63cbef8944 100644
--- a/engines/scumm/room.cpp
+++ b/engines/scumm/room.cpp
@@ -552,6 +552,10 @@ void ScummEngine::resetRoomSubBlocks() {
 		}
 	}
 
+	// We need to setup the current palette before initCycl for Indy4 Amiga.
+	if (_PALS_offs || _CLUT_offs)
+		setCurrentPalette(0);
+
 	// Color cycling
 	// HE 7.0 games load resources but don't use them.
 	if (_game.version >= 4 && _game.heversion <= 62) {
@@ -570,9 +574,6 @@ void ScummEngine::resetRoomSubBlocks() {
 		}
 	}
 #endif
-
-	if (_PALS_offs || _CLUT_offs)
-		setCurrentPalette(0);
 }
 
 
-- 
cgit v1.2.3