aboutsummaryrefslogtreecommitdiff
path: root/engines/lure/hotspots.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2010-04-05 07:27:16 +0000
committerPaul Gilbert2010-04-05 07:27:16 +0000
commit4aacbc5351bebbb4d9a2683fa2713e8270fc3cd1 (patch)
tree82bdd8740d1724244f400d3af58d93fc33ddaea1 /engines/lure/hotspots.cpp
parentde3dd04005f802059833df1f5ac09da5c1f015c4 (diff)
downloadscummvm-rg350-4aacbc5351bebbb4d9a2683fa2713e8270fc3cd1.tar.gz
scummvm-rg350-4aacbc5351bebbb4d9a2683fa2713e8270fc3cd1.tar.bz2
scummvm-rg350-4aacbc5351bebbb4d9a2683fa2713e8270fc3cd1.zip
Corrected check to ensure return isn't issued if it's already in progress
svn-id: r48535
Diffstat (limited to 'engines/lure/hotspots.cpp')
-rw-r--r--engines/lure/hotspots.cpp3
1 files changed, 2 insertions, 1 deletions
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);