diff options
-rw-r--r-- | engines/parallaction/parallaction.cpp | 2 | ||||
-rw-r--r-- | engines/parallaction/parallaction.h | 2 | ||||
-rw-r--r-- | engines/parallaction/parser.h | 2 | ||||
-rw-r--r-- | engines/parallaction/parser_ns.cpp | 8 | ||||
-rw-r--r-- | engines/parallaction/walk.cpp | 8 | ||||
-rw-r--r-- | engines/parallaction/walk.h | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index 163f3009e1..b5f2de851b 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -259,7 +259,7 @@ void Parallaction::freeLocation() { _localFlagNames->clear(); - _location._walkNodes.clear(); + _location._walkPoints.clear(); _gfx->clearGfxObjects(kGfxObjNormal); freeBackground(); diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h index 5bbd6ea8c7..24e9b18ba9 100644 --- a/engines/parallaction/parallaction.h +++ b/engines/parallaction/parallaction.h @@ -177,7 +177,7 @@ struct Location { char _soundFile[50]; // NS specific - PointList _walkNodes; + PointList _walkPoints; char _slideText[2][MAX_TOKEN_LEN]; // BRA specific diff --git a/engines/parallaction/parser.h b/engines/parallaction/parser.h index a31be2ccb0..67515627d0 100644 --- a/engines/parallaction/parser.h +++ b/engines/parallaction/parser.h @@ -193,7 +193,7 @@ protected: void parseZone(ZoneList &list, char *name); void parseZoneTypeBlock(ZonePtr z); - void parseWalkNodes(PointList &list); + void parsePointList(PointList &list); void parseAnimation(AnimationList &list, char *name); void parseCommands(CommandList&); void parseCommandFlags(); diff --git a/engines/parallaction/parser_ns.cpp b/engines/parallaction/parser_ns.cpp index 3595fa5696..b06eccc81c 100644 --- a/engines/parallaction/parser_ns.cpp +++ b/engines/parallaction/parser_ns.cpp @@ -1011,7 +1011,7 @@ DECLARE_LOCATION_PARSER(disk) { DECLARE_LOCATION_PARSER(nodes) { debugC(7, kDebugParser, "LOCATION_PARSER(nodes) "); - parseWalkNodes(_vm->_location._walkNodes); + parsePointList(_vm->_location._walkPoints); } @@ -1124,8 +1124,8 @@ void LocationParser_ns::parse(Script *script) { resolveCommandForwards(); } -void LocationParser_ns::parseWalkNodes(PointList &list) { - debugC(5, kDebugParser, "parseWalkNodes()"); +void LocationParser_ns::parsePointList(PointList &list) { + debugC(5, kDebugParser, "parsePointList()"); _script->readLineToken(true); while (scumm_stricmp(_tokens[0], "ENDNODES")) { @@ -1137,7 +1137,7 @@ void LocationParser_ns::parseWalkNodes(PointList &list) { _script->readLineToken(true); } - debugC(5, kDebugParser, "parseWalkNodes() done"); + debugC(5, kDebugParser, "parsePointList() done"); return; } diff --git a/engines/parallaction/walk.cpp b/engines/parallaction/walk.cpp index 1914117915..98557bf22c 100644 --- a/engines/parallaction/walk.cpp +++ b/engines/parallaction/walk.cpp @@ -97,13 +97,13 @@ uint32 PathBuilder::buildSubPath(const Common::Point& pos, const Common::Point& while (true) { - PointList::iterator nearest = _vm->_location._walkNodes.end(); - PointList::iterator locNode = _vm->_location._walkNodes.begin(); + PointList::iterator nearest = _vm->_location._walkPoints.end(); + PointList::iterator locNode = _vm->_location._walkPoints.begin(); // scans location path nodes searching for the nearest Node // which can't be farther than the target position // otherwise no _closest_node is selected - while (locNode != _vm->_location._walkNodes.end()) { + while (locNode != _vm->_location._walkPoints.end()) { Common::Point v8 = *locNode; v2C = v8.sqrDist(stop); @@ -117,7 +117,7 @@ uint32 PathBuilder::buildSubPath(const Common::Point& pos, const Common::Point& locNode++; } - if (nearest == _vm->_location._walkNodes.end()) break; + if (nearest == _vm->_location._walkPoints.end()) break; v20 = *nearest; v34 = v30 = v20.sqrDist(stop); diff --git a/engines/parallaction/walk.h b/engines/parallaction/walk.h index c2114c5988..b68a7f585f 100644 --- a/engines/parallaction/walk.h +++ b/engines/parallaction/walk.h @@ -45,7 +45,7 @@ class PathBuilder { void correctPathPoint(Common::Point &to); uint32 buildSubPath(const Common::Point& pos, const Common::Point& stop); - uint16 walkFunc1(int16 x, int16 y, Common::Point& Node); + uint16 walkFunc1(int16 x, int16 y, Common::Point& node); public: PathBuilder(AnimationPtr anim); |