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

[lordhoto at users.sourceforge.net]

Revision: 31217
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31217&view=rev
Author:   lordhoto
Date:     2008-03-21 17:33:05 -0700 (Fri, 21 Mar 2008)

Log Message:
-----------
Fix for bug #1922521 "HoF: mountaineer sprite vanishes".

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/animator_v2.cpp
    scummvm/trunk/engines/kyra/script_v2.cpp

Modified: scummvm/trunk/engines/kyra/animator_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/animator_v2.cpp	2008-03-21 23:57:05 UTC (rev 31216)
+++ scummvm/trunk/engines/kyra/animator_v2.cpp	2008-03-22 00:33:05 UTC (rev 31217)
@@ -112,6 +112,9 @@
 		cur = cur->nextObject;
 	}
 
+	if (cur != entry)
+		return list;
+
 	if (cur == list) {
 		if (!cur->nextObject)
 			return 0;

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-21 23:57:05 UTC (rev 31216)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-22 00:33:05 UTC (rev 31217)
@@ -1415,6 +1415,7 @@
 	restorePage3();
 
 	SceneAnim &anim = _sceneAnims[index];
+	anim.flags = flags;
 	anim.x = stackPos(2);
 	anim.y = stackPos(3);
 	anim.x2 = stackPos(4);
@@ -1490,7 +1491,7 @@
 	obj.unk8 = 1;
 	if (stackPos(1))
 		refreshAnimObjectsIfNeed();
-	obj.enabled = false;
+	obj.enabled = 0;
 	_animList = deleteAnimListEntry(_animList, &_animObjects[1+index]);
 	
 	if (_sceneAnimMovie[index]->opened())


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