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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Tue Mar 18 15:27:23 CET 2008


Revision: 31181
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31181&view=rev
Author:   lordhoto
Date:     2008-03-18 07:27:22 -0700 (Tue, 18 Mar 2008)

Log Message:
-----------
Fixed bug in o2_setupSceneAnimation. (should fix some lockups)

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

Modified: scummvm/trunk/engines/kyra/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-18 13:51:16 UTC (rev 31180)
+++ scummvm/trunk/engines/kyra/script_v2.cpp	2008-03-18 14:27:22 UTC (rev 31181)
@@ -1256,6 +1256,8 @@
 	const int index = stackPos(0);
 	const uint16 flags = stackPos(1);
 
+	restorePage3();
+
 	SceneAnim &anim = _sceneAnims[index];
 	anim.x = stackPos(2);
 	anim.y = stackPos(3);
@@ -1315,6 +1317,11 @@
 	obj->height = anim.height;
 	obj->width2 = obj->height2 = anim.specialSize;
 
+	// be sure we don't have an the object allready in the anim list
+	// else we get look ups in some places, the original doesn't do this
+	// though
+	_animList = deleteAnimListEntry(_animList, obj);
+
 	_animList = addToAnimListSorted(_animList, obj);
 	obj->needRefresh = 1;
 	obj->unk8 = 1;


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




More information about the Scummvm-git-logs mailing list