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

[lordhoto at users.sourceforge.net]

Revision: 43285
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43285&view=rev
Author:   lordhoto
Date:     2009-08-11 18:17:53 +0000 (Tue, 11 Aug 2009)

Log Message:
-----------
Fix graphical glitches when loading saves where Brandon is in Will-O-Wisp form.

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

Modified: scummvm/trunk/engines/kyra/saveload_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_lok.cpp	2009-08-11 18:17:07 UTC (rev 43284)
+++ scummvm/trunk/engines/kyra/saveload_lok.cpp	2009-08-11 18:17:53 UTC (rev 43285)
@@ -182,7 +182,16 @@
 	}
 
 	setHandItem(_itemInHand);
-	_animator->setBrandonAnimSeqSize(3, 48);
+
+	// Will-O-Wisp uses a different shape size than Brandon's usual
+	// shape, thus we need to setup the correct size depending on
+	// his state over here. This fixes graphics glitches when loading
+	// saves, where Brandon is transformed into the Will-O-Wisp.
+	if (_brandonStatusBit & 2)
+		_animator->setBrandonAnimSeqSize(5, 48);
+	else
+		_animator->setBrandonAnimSeqSize(3, 48);
+
 	redrawInventory(0);
 	
 	_brandonPosX = _brandonPosY = -1;

Modified: scummvm/trunk/engines/kyra/sequences_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lok.cpp	2009-08-11 18:17:07 UTC (rev 43284)
+++ scummvm/trunk/engines/kyra/sequences_lok.cpp	2009-08-11 18:17:53 UTC (rev 43285)
@@ -680,7 +680,7 @@
 		_animator->animRefreshNPC(0);
 		delayWithTicks(8);
 	}
-	_animator->setBrandonAnimSeqSize(4, 48);
+	_animator->setBrandonAnimSeqSize(3, 48);
 	_currentCharacter->currentAnimFrame = 7;
 	_animator->animRefreshNPC(0);
 


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