From 4aacbc5351bebbb4d9a2683fa2713e8270fc3cd1 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 5 Apr 2010 07:27:16 +0000
Subject: Corrected check to ensure return isn't issued if it's already in
 progress

svn-id: r48535
---
 engines/lure/hotspots.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'engines/lure')

diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index ca89af2af9..d247c343ca 100644
--- a/engines/lure/hotspots.cpp
+++ b/engines/lure/hotspots.cpp
@@ -4022,7 +4022,8 @@ void HotspotTickHandlers::npcRoomChange(Hotspot &h) {
 		if (h.currentActions().size() > 1) {
 			// Pending items on stack
 			if (h.startRoomNumber() != 0) {
-				if (!h.currentActions().bottom().hasSupportData() || (h.currentActions().bottom().action() != RETURN)) {
+				if (!h.currentActions().bottom().hasSupportData() || 
+					(h.currentActions().bottom().supportData().action() != RETURN)) {
 					// Signal character to return
 					h.currentActions().clear();
 					h.currentActions().addFront(RETURN, h.startRoomNumber(), 0, 0);
-- 
cgit v1.2.3