aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2006-05-11 08:25:09 +0000
committerTorbjörn Andersson2006-05-11 08:25:09 +0000
commitd6af07989df23219293cf6117e6cd0ae6a63e2e9 (patch)
tree2db725206f99c1f4c8b28575f871e343ebebca6f
parent21b91adcdfe91f943f0b74502c4dfe1a3dca55cc (diff)
downloadscummvm-rg350-d6af07989df23219293cf6117e6cd0ae6a63e2e9.tar.gz
scummvm-rg350-d6af07989df23219293cf6117e6cd0ae6a63e2e9.tar.bz2
scummvm-rg350-d6af07989df23219293cf6117e6cd0ae6a63e2e9.zip
This could be completely wrong, but I don't think Hotspot::stopWalking() is
supposed to call setCurrentAction() in Resources, because then ScummVM will crash in getCurrentActionStr() whenever we try to interact with any object. Since Hotspot::walkTo() calls setCurrentAction() in Hotspot, it seems like a reasonable guess that this is the setCurrentAction() that stopWalking() should call as well. svn-id: r22409
-rw-r--r--engines/lure/hotspots.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index b1501eff73..e4570148d6 100644
--- a/engines/lure/hotspots.cpp
+++ b/engines/lure/hotspots.cpp
@@ -308,7 +308,7 @@ void Hotspot::stopWalking() {
_actionCtr = 0;
_currentActions.clear();
Room::getReference().setCursorState(CS_NONE);
- Resources::getReference().setCurrentAction(NONE);
+ setCurrentAction(NO_ACTION);
}
void Hotspot::setDirection(Direction dir) {