[Scummvm-cvs-logs] SF.net SVN: scummvm:[49137] scummvm/trunk/engines/parallaction/input.cpp

[peres001 at users.sourceforge.net]

Revision: 49137
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49137&view=rev
Author:   peres001
Date:     2010-05-22 12:36:52 +0000 (Sat, 22 May 2010)

Log Message:
-----------
Do not make the character walk towards the zone clicked upon by the user if it is marked for self-use. See patch 3003626.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/input.cpp

Modified: scummvm/trunk/engines/parallaction/input.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/input.cpp	2010-05-22 12:36:36 UTC (rev 49136)
+++ scummvm/trunk/engines/parallaction/input.cpp	2010-05-22 12:36:52 UTC (rev 49137)
@@ -326,8 +326,13 @@
 
 	if ((_mouseButtons == kMouseLeftUp) && ((_activeItem._id != 0) || (ACTIONTYPE(z) == kZoneCommand))) {
 
-		if (z->_flags & kFlagsNoWalk) {
-			// character doesn't need to walk to take specified action
+		bool noWalk = z->_flags & kFlagsNoWalk;	// check the explicit no-walk flag
+		if (_gameType == GType_BRA) {
+			// action performed on object marked for self-use do not need walk in BRA
+			noWalk |= z->_flags & kFlagsYourself;
+		}
+
+		if (noWalk) {
 			takeAction(z);
 		} else {
 			// action delayed: if Zone defined a moveto position the character is programmed to move there,


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