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

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Tue Nov 13 09:47:26 CET 2007


Revision: 29489
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29489&view=rev
Author:   dreammaster
Date:     2007-11-13 00:47:25 -0800 (Tue, 13 Nov 2007)

Log Message:
-----------
Tweak to object walk to position calculations - NPCs will no longer get stuck in doors they close

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

Modified: scummvm/trunk/engines/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/lure/hotspots.cpp	2007-11-13 08:06:15 UTC (rev 29488)
+++ scummvm/trunk/engines/lure/hotspots.cpp	2007-11-13 08:47:25 UTC (rev 29489)
@@ -1071,11 +1071,9 @@
 		_walkFlag = true;
 
 		if ((hotspot->walkY & 0x8000) != 0) {
-			// Special handling for walking
-//			if (((xp >> 3) != (x() >> 3)) ||
-//				((((y() + heightCopy()) >> 3) - 1) != (yp >> 3))) {
-			if ((ABS(xp - x()) > 8) || 
-				(ABS(yp - (y() + heightCopy())) > 8)) {
+			if (((x() >> 3) != (xp >> 3)) || 
+				((((y() + heightCopy()) >> 3) - 1) != (yp >> 3))) {
+				// Walk to the specified destination
 				walkTo(xp, yp);
 				return true;
 			} else {


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