From 33934251cbd5ce7f4db3e5e44fd7ae2741233093 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 17 Feb 2009 17:17:47 +0000
Subject: Fix for long delay while fading palette in Zanthia's home, when
 mixing potions.

svn-id: r38425
---
 engines/kyra/screen.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'engines')

diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index cd2227f130..71d49a7aae 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -422,10 +422,9 @@ void Screen::getFadeParams(const uint8 *palette, int delay, int &delayInc, int &
 		maxDiff = MAX<uint8>(maxDiff, diff);
 	}
 
-	delayInc = delay << 8;
+	delayInc = (delay << 8) & 0x7FFF;
 	if (maxDiff != 0)
 		delayInc /= maxDiff;
-	delayInc &= 0x7FFF;
 
 	delay = delayInc;
 	for (diff = 1; diff <= maxDiff; ++diff) {
-- 
cgit v1.2.3