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

[lordhoto at users.sourceforge.net]

Revision: 22707
Author:   lordhoto
Date:     2006-05-28 04:33:17 -0700 (Sun, 28 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22707&view=rev

Log Message:
-----------
Fixes bug # 1494945 ("KYRA1: Actor disappearing in an animation").

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/animator.cpp
    scummvm/trunk/engines/kyra/kyra.h
Modified: scummvm/trunk/engines/kyra/animator.cpp
===================================================================
--- scummvm/trunk/engines/kyra/animator.cpp	2006-05-28 11:08:46 UTC (rev 22706)
+++ scummvm/trunk/engines/kyra/animator.cpp	2006-05-28 11:33:17 UTC (rev 22707)
@@ -210,7 +210,7 @@
 		// the problem is that the restored area to the 'backbuffer' (screen page 2)
 		// isn't updated on the front buffer in that special scene, so we update
 		// the frontbuffer (screen page 0) too if the object get's redrawn this time
-		if (obj->refreshFlag) {
+		if (obj->refreshFlag && _vm->getScene() == 109) {
 			// do not overwrite the interface
 			if (x <= 1) {
 				width--;

Modified: scummvm/trunk/engines/kyra/kyra.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra.h	2006-05-28 11:08:46 UTC (rev 22706)
+++ scummvm/trunk/engines/kyra/kyra.h	2006-05-28 11:33:17 UTC (rev 22707)
@@ -271,7 +271,10 @@
 	Character *currentCharacter() { return _currentCharacter; }
 	Character *characterList() { return _characterList; }
 	uint16 brandonStatus() { return _brandonStatusBit; }
-	
+
+	// TODO: remove me with workaround in animator.cpp l209
+	uint16 getScene() { return _currentRoom; }
+
 	bool quit() const { return _quitFlag; }
 
 	int _paletteChanged;


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