From e179f3f6ed35864517cf4cb5e99e6b8002bf1d5d Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 11 Jan 2006 13:28:38 +0000
Subject: Fixed for bug report # 1401360. Also added some delay calls while
 waiting in some script functions.

svn-id: r19982
---
 kyra/screen.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'kyra/screen.cpp')

diff --git a/kyra/screen.cpp b/kyra/screen.cpp
index f4071c880b..c9d6a08687 100644
--- a/kyra/screen.cpp
+++ b/kyra/screen.cpp
@@ -155,7 +155,7 @@ void Screen::fadeSpecialPalette(int palIndex, int startIndex, int size, int fade
 	uint8 tempPal[768];
 	memcpy(tempPal, _currentPalette, 768);
 	memcpy(&tempPal[startIndex*3], _vm->palTable1()[palIndex], size*3);
-	fadePalette(tempPal, fadeTime*9);
+	fadePalette(tempPal, fadeTime*18);
 	memcpy(&_currentPalette[startIndex*3], &tempPal[startIndex*3], size*3);
 	setScreenPalette(_currentPalette);
 	_system->updateScreen();
@@ -172,11 +172,11 @@ void Screen::fadePalette(const uint8 *palData, int delay) {
 			maxDiff = diff;
 		}
 	}
-	delay <<= 8;
+	int16 delayInc = delay << 8;
 	if (maxDiff != 0) {
-		delay /= maxDiff;
+		delayInc /= maxDiff;
 	}
-	int delayInc = delay;
+	delay = delayInc;
 	for (diff = 1; diff <= maxDiff; ++diff) {
 		if (delayInc >= 512) {
 			break;
-- 
cgit v1.2.3