[Scummvm-cvs-logs] SF.net SVN: scummvm: [24687] scummvm/trunk/engines/lure/hotspots.cpp

[dreammaster at users.sourceforge.net]

Revision: 24687
          http://svn.sourceforge.net/scummvm/?rev=24687&view=rev
Author:   dreammaster
Date:     2006-11-11 20:39:10 -0800 (Sat, 11 Nov 2006)

Log Message:
-----------
Bugfix to prevent pathfinder failure after making a small step

Modified Paths:
--------------
    scummvm/trunk/engines/lure/hotspots.cpp

Modified: scummvm/trunk/engines/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/lure/hotspots.cpp	2006-11-12 03:26:44 UTC (rev 24686)
+++ scummvm/trunk/engines/lure/hotspots.cpp	2006-11-12 04:39:10 UTC (rev 24687)
@@ -1665,7 +1665,7 @@
 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 @@
 					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 @@
 			else if (_xDestPos < 0) 
 				add(LEFT, -_xDestPos);
 
+			_inProgress = false;
 			goto final_step;
 		}
 
@@ -3140,7 +3141,8 @@
 			scanFlag = true;
 			break;
 		}
-	} 
+	}
+	_inProgress = false;
 
 	if (scanFlag || _destOccupied) {
 		// Adjust the end point if necessary to stop character walking into occupied area


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.