From 813ca5cf39633851451b9aac779003f9ed5c4c45 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 17 Nov 2007 10:49:14 +0000
Subject: Added missing code to deactivate animations that have finished

svn-id: r29536
---
 engines/lure/hotspots.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'engines/lure')

diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index a885229ef6..bc0e424301 100644
--- a/engines/lure/hotspots.cpp
+++ b/engines/lure/hotspots.cpp
@@ -2321,10 +2321,18 @@ void HotspotTickHandlers::defaultHandler(Hotspot &h) {
 }
 
 void HotspotTickHandlers::standardAnimHandler(Hotspot &h) {
+	Resources &res = Resources::getReference();
+
 	if (h.frameCtr() > 0) 
 		h.decrFrameCtr();
-	else 
-		h.executeScript();
+	else {
+		if (h.executeScript()) {
+			// Script is finished - deactivate hotspot and move it to an out of range room
+			HotspotData *data = h.resource();
+			res.deactivateHotspot(&h);
+			data->roomNumber |= 0x8000;
+		}
+	}
 }
 
 void HotspotTickHandlers::standardAnimHandler2(Hotspot &h) {
-- 
cgit v1.2.3