[Scummvm-cvs-logs] SF.net SVN: scummvm: [26269] scummvm/trunk/engines/parallaction/walk.cpp
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Wed Mar 21 20:42:10 CET 2007
Revision: 26269
http://scummvm.svn.sourceforge.net/scummvm/?rev=26269&view=rev
Author: peres001
Date: 2007-03-21 12:42:09 -0700 (Wed, 21 Mar 2007)
Log Message:
-----------
got rid of cryptic pseudo-boolean variable in buildWalkPath
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/walk.cpp
Modified: scummvm/trunk/engines/parallaction/walk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/walk.cpp 2007-03-21 19:35:51 UTC (rev 26268)
+++ scummvm/trunk/engines/parallaction/walk.cpp 2007-03-21 19:42:09 UTC (rev 26269)
@@ -143,7 +143,6 @@
Common::Point pos(_vm->_char._ani._left, _vm->_char._ani._top);
- byte _closest_node_found = 1;
bool emptyList = true;
Common::Point v8;
@@ -156,9 +155,9 @@
v34 = v30 = pos.sqrDist(stop); // square distance from current position and target
- while (_closest_node_found != 0) {
+ while (true) {
- _closest_node_found = 0;
+ _closest_node = NULL;
WalkNode *location_node = (WalkNode*)_vm->_location._walkNodes._next;
// scans location path nodes searching for the nearest Node
@@ -171,7 +170,6 @@
v28 = v8.sqrDist(v20);
if (v2C < v34 && v28 < v30) {
- _closest_node_found = 1;
v30 = v28;
_closest_node = location_node;
}
@@ -179,7 +177,7 @@
location_node = (WalkNode*)location_node->_next;
}
- if (_closest_node_found == 0) break;
+ if (_closest_node == NULL) break;
WalkNode *_newnode = new WalkNode(*_closest_node);
_newnode->getPoint(v20);
@@ -199,25 +197,15 @@
freeNodeList(v58._next);
debugC(1, kDebugWalk, "can't find a path node: rejecting partial path");
return v44;
- } else {
- ((WalkNode*)(v58._next))->getPoint(stop);
- emptyList = false;
- _closest_node_found = 1;
}
+ ((WalkNode*)(v58._next))->getPoint(stop);
+ emptyList = false;
+
} while (true);
debugC(1, kDebugWalk, "walk path completed");
- WalkNode* tmp = &v58;
- uint16 i = 1;
- while (tmp->_next) {
- debugC(1, kDebugWalk, "node %i: %i, %i", i, tmp->_x, tmp->_y);
- tmp = (WalkNode*)tmp->_next;
- i++;
- }
-
-
delete v44;
return (WalkNode*)v58._next;
}
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