From 73ea378dee4e7ec31c7a898e7fcc3a65a9eb6cc1 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 22 Jun 2009 02:36:54 +0000
Subject: - Changed the following Screen functions to take a reference to a
 Palette object: 	-> setScreenPalette 	-> fadePalette 	->
 getFadeParams 	-> fadePalStep - Fixed initialization of 256 color palettes

svn-id: r41743
---
 engines/kyra/screen_v2.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'engines/kyra/screen_v2.cpp')

diff --git a/engines/kyra/screen_v2.cpp b/engines/kyra/screen_v2.cpp
index 9f72725d2d..1446315be5 100644
--- a/engines/kyra/screen_v2.cpp
+++ b/engines/kyra/screen_v2.cpp
@@ -114,12 +114,11 @@ int Screen_v2::findLeastDifferentColor(const uint8 *paletteEntry, const uint8 *p
 	return r;
 }
 
-void Screen_v2::getFadeParams(const uint8 *palette, int delay, int &delayInc, int &diff) {
+void Screen_v2::getFadeParams(const Palette &pal, int delay, int &delayInc, int &diff) {
 	int maxDiff = 0;
 	diff = 0;
-	int len = _use16ColorMode ? 48 : 768;
-	for (int i = 0; i < len; ++i) {
-		diff = ABS(palette[i] - (*_screenPalette)[i]);
+	for (int i = 0; i < pal.getNumColors() * 3; ++i) {
+		diff = ABS(pal[i] - (*_screenPalette)[i]);
 		maxDiff = MAX(maxDiff, diff);
 	}
 
-- 
cgit v1.2.3