aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2006-11-12 04:39:10 +0000
committerPaul Gilbert2006-11-12 04:39:10 +0000
commit0a5b86736cc0ab55ec3fa39394a5e4069ddcfa01 (patch)
treef9275db435b5222f6e2078ddf49d1b0fdb4d8791
parent8d37c135c07223772b2e4395b2655cbee239ddf0 (diff)
downloadscummvm-rg350-0a5b86736cc0ab55ec3fa39394a5e4069ddcfa01.tar.gz
scummvm-rg350-0a5b86736cc0ab55ec3fa39394a5e4069ddcfa01.tar.bz2
scummvm-rg350-0a5b86736cc0ab55ec3fa39394a5e4069ddcfa01.zip
Bugfix to prevent pathfinder failure after making a small step
svn-id: r24687
-rw-r--r--engines/lure/hotspots.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index 32a111a97d..d1a8991fe0 100644
--- a/engines/lure/hotspots.cpp
+++ b/engines/lure/hotspots.cpp
@@ -1665,7 +1665,7 @@ void Hotspot::npcExecScript(HotspotData *hotspot) {
void Hotspot::npcResetPausedList(HotspotData *hotspot) {
Resources &res = Resources::getReference();
setCharacterMode(CHARMODE_HESITATE);
- setDelayCtr(16);
+ setDelayCtr(IDLE_COUNTDOWN_SIZE + 1);
res.pausedList().reset(hotspotId());
endAction();
@@ -2515,7 +2515,7 @@ void HotspotTickHandlers::playerAnimHandler(Hotspot &h) {
room.setCursorState(CS_NONE);
if (fields.playerPendingPos().isSet) {
h.setCharacterMode(CHARMODE_6);
- h.setDelayCtr(15);
+ h.setDelayCtr(IDLE_COUNTDOWN_SIZE);
return;
}
@@ -3072,6 +3072,7 @@ bool PathFinder::process() {
else if (_xDestPos < 0)
add(LEFT, -_xDestPos);
+ _inProgress = false;
goto final_step;
}
@@ -3140,7 +3141,8 @@ bool PathFinder::process() {
scanFlag = true;
break;
}
- }
+ }
+ _inProgress = false;
if (scanFlag || _destOccupied) {
// Adjust the end point if necessary to stop character walking into occupied area