From 07bb52b78e08c5ba66e58644b81f8186c1ef1e94 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 22 Mar 2008 00:33:05 +0000
Subject: Fix for bug #1922521 "HoF: mountaineer sprite vanishes".

svn-id: r31217
---
 engines/kyra/animator_v2.cpp | 3 +++
 engines/kyra/script_v2.cpp   | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/engines/kyra/animator_v2.cpp b/engines/kyra/animator_v2.cpp
index 1a0fcbb939..2ebc719d42 100644
--- a/engines/kyra/animator_v2.cpp
+++ b/engines/kyra/animator_v2.cpp
@@ -112,6 +112,9 @@ KyraEngine_v2::AnimObj *KyraEngine_v2::deleteAnimListEntry(AnimObj *list, AnimOb
 		cur = cur->nextObject;
 	}
 
+	if (cur != entry)
+		return list;
+
 	if (cur == list) {
 		if (!cur->nextObject)
 			return 0;
diff --git a/engines/kyra/script_v2.cpp b/engines/kyra/script_v2.cpp
index 78b720d6e9..0d086c491f 100644
--- a/engines/kyra/script_v2.cpp
+++ b/engines/kyra/script_v2.cpp
@@ -1415,6 +1415,7 @@ int KyraEngine_v2::o2_setupSceneAnimation(ScriptState *script) {
 	restorePage3();
 
 	SceneAnim &anim = _sceneAnims[index];
+	anim.flags = flags;
 	anim.x = stackPos(2);
 	anim.y = stackPos(3);
 	anim.x2 = stackPos(4);
@@ -1490,7 +1491,7 @@ int KyraEngine_v2::o2_stopSceneAnimation(ScriptState *script) {
 	obj.unk8 = 1;
 	if (stackPos(1))
 		refreshAnimObjectsIfNeed();
-	obj.enabled = false;
+	obj.enabled = 0;
 	_animList = deleteAnimListEntry(_animList, &_animObjects[1+index]);
 	
 	if (_sceneAnimMovie[index]->opened())
-- 
cgit v1.2.3