[Scummvm-cvs-logs] SF.net SVN: scummvm:[36154] scummvm/branches/branch-0-13-0/engines/lure/ res_struct.cpp

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Sat Jan 31 02:59:31 CET 2009


Revision: 36154
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36154&view=rev
Author:   dreammaster
Date:     2009-01-31 01:59:27 +0000 (Sat, 31 Jan 2009)

Log Message:
-----------
Backport of bugfix to properly have one NPC character move out of the way when two NPCs bump into each other

Modified Paths:
--------------
    scummvm/branches/branch-0-13-0/engines/lure/res_struct.cpp

Modified: scummvm/branches/branch-0-13-0/engines/lure/res_struct.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/lure/res_struct.cpp	2009-01-31 01:58:10 UTC (rev 36153)
+++ scummvm/branches/branch-0-13-0/engines/lure/res_struct.cpp	2009-01-31 01:59:27 UTC (rev 36154)
@@ -1173,11 +1173,9 @@
 			hotspot->setPauseCtr(IDLE_COUNTDOWN_SIZE);
 		}
 
+		if (result == 0)
+			charHotspot->setRandomDest();
 		result = 2;
-		if (charHotspot->currentActions().isEmpty())
-			charHotspot->currentActions().addFront(START_WALKING, charHotspot->roomNumber());
-		else
-			charHotspot->currentActions().top().setAction(START_WALKING);
 	}
 
 	return result;


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