[Scummvm-cvs-logs] SF.net SVN: scummvm:[43249] scummvm/trunk/engines/kyra/sequences_lok.cpp

[lordhoto at users.sourceforge.net]

Revision: 43249
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43249&view=rev
Author:   lordhoto
Date:     2009-08-11 01:47:29 +0000 (Tue, 11 Aug 2009)

Log Message:
-----------
Fix crash when using Will-O-Wisp in the grotto.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sequences_lok.cpp

Modified: scummvm/trunk/engines/kyra/sequences_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lok.cpp	2009-08-11 01:31:34 UTC (rev 43248)
+++ scummvm/trunk/engines/kyra/sequences_lok.cpp	2009-08-11 01:47:29 UTC (rev 43249)
@@ -718,10 +718,16 @@
 	_animator->animRefreshNPC(0);
 	_animator->updateAllObjectShapes();
 
-	if (_currentCharacter->sceneId >= 229 && _currentCharacter->sceneId <= 245)
-		_screen->fadeSpecialPalette(30, 234, 13, 4);
-	else if (_currentCharacter->sceneId >= 118 && _currentCharacter->sceneId <= 186)
-		_screen->fadeSpecialPalette(14, 228, 15, 4);
+	if (_flags.platform == Common::kPlatformAmiga) {
+		if ((_currentCharacter->sceneId >= 229 && _currentCharacter->sceneId <= 245) || 
+			(_currentCharacter->sceneId >= 118 && _currentCharacter->sceneId <= 186))
+			_screen->fadePalette(_screen->getPalette(10), 0x54);
+	} else {
+		if (_currentCharacter->sceneId >= 229 && _currentCharacter->sceneId <= 245)
+			_screen->fadeSpecialPalette(30, 234, 13, 4);
+		else if (_currentCharacter->sceneId >= 118 && _currentCharacter->sceneId <= 186)
+			_screen->fadeSpecialPalette(14, 228, 15, 4);
+	}
 
 	freeShapes123();
 	_screen->showMouse();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.