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

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Sun Nov 29 10:02:10 CET 2009


Revision: 46189
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46189&view=rev
Author:   dreammaster
Date:     2009-11-29 09:02:02 +0000 (Sun, 29 Nov 2009)

Log Message:
-----------
Bugfix for reactivating an NPC when it was previously deactivated at precisely the moment when it was about to do a pathfinding

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

Modified: scummvm/trunk/engines/lure/res.cpp
===================================================================
--- scummvm/trunk/engines/lure/res.cpp	2009-11-29 02:22:08 UTC (rev 46188)
+++ scummvm/trunk/engines/lure/res.cpp	2009-11-29 09:02:02 UTC (rev 46189)
@@ -656,6 +656,11 @@
 		// Default characters to facing upwards until they start moving
 		hotspot->setDirection(UP);
 		hotspot->setCharRectY(0);
+
+		// When reactivating an NPC, ensure that their previous state wasn't PROCESSING_PATH, since
+		// the pause has destroyed the previously decided destination position
+		if (!hData->npcSchedule.isEmpty() && (hData->npcSchedule.top().action() == PROCESSING_PATH))
+			hData->npcSchedule.top().setAction(DISPATCH_ACTION);
 	}
 
 	return hotspot;


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




More information about the Scummvm-git-logs mailing list