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

[dreammaster at users.sourceforge.net]

Revision: 53402
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53402&view=rev
Author:   dreammaster
Date:     2010-10-13 10:12:35 +0000 (Wed, 13 Oct 2010)

Log Message:
-----------
LURE: Bugfix for characters getting stuck in Abbey doorway

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

Modified: scummvm/trunk/engines/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/lure/hotspots.cpp	2010-10-13 07:14:38 UTC (rev 53401)
+++ scummvm/trunk/engines/lure/hotspots.cpp	2010-10-13 10:12:35 UTC (rev 53402)
@@ -4170,6 +4170,7 @@
 		_inProgress = true;
 		initVars();
 
+		Common::Point diff(_destX - _xCurrent, _destY - _yCurrent);
 		_xCurrent >>= 3; _yCurrent >>= 3;
 		_xDestCurrent >>= 3; _yDestCurrent >>= 3;
 		if ((_xCurrent == _xDestCurrent) && (_yCurrent == _yDestCurrent)) {
@@ -4178,6 +4179,10 @@
 				add(RIGHT, _xDestPos);
 			else if (_xDestPos < 0)
 				add(LEFT, -_xDestPos);
+			else if (diff.y > 0)
+				add(DOWN, diff.y);
+			else
+				add(UP, -diff.y);
 
 			_inProgress = false;
 			result = PF_OK;
@@ -4353,7 +4358,7 @@
 			break;
 	}
 
-	// Add a final move if necessary
+	// Add final movement if necessary
 
 	if (result == PF_OK) {
 		if (_xDestPos < 0)


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