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

[peres001 at users.sourceforge.net]

Revision: 33290
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33290&view=rev
Author:   peres001
Date:     2008-07-25 16:08:10 +0000 (Fri, 25 Jul 2008)

Log Message:
-----------
Changed the remaining references to Nodes into Points.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/parallaction.cpp
    scummvm/trunk/engines/parallaction/parallaction.h
    scummvm/trunk/engines/parallaction/parser.h
    scummvm/trunk/engines/parallaction/parser_ns.cpp
    scummvm/trunk/engines/parallaction/walk.cpp
    scummvm/trunk/engines/parallaction/walk.h

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2008-07-25 16:01:25 UTC (rev 33289)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2008-07-25 16:08:10 UTC (rev 33290)
@@ -259,7 +259,7 @@
 
 	_localFlagNames->clear();
 
-	_location._walkNodes.clear();
+	_location._walkPoints.clear();
 
 	_gfx->clearGfxObjects(kGfxObjNormal);
 	freeBackground();

Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h	2008-07-25 16:01:25 UTC (rev 33289)
+++ scummvm/trunk/engines/parallaction/parallaction.h	2008-07-25 16:08:10 UTC (rev 33290)
@@ -177,7 +177,7 @@
 	char		_soundFile[50];
 
 	// NS specific
-	PointList	_walkNodes;
+	PointList	_walkPoints;
 	char _slideText[2][MAX_TOKEN_LEN];
 
 	// BRA specific

Modified: scummvm/trunk/engines/parallaction/parser.h
===================================================================
--- scummvm/trunk/engines/parallaction/parser.h	2008-07-25 16:01:25 UTC (rev 33289)
+++ scummvm/trunk/engines/parallaction/parser.h	2008-07-25 16:08:10 UTC (rev 33290)
@@ -193,7 +193,7 @@
 
 	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();

Modified: scummvm/trunk/engines/parallaction/parser_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parser_ns.cpp	2008-07-25 16:01:25 UTC (rev 33289)
+++ scummvm/trunk/engines/parallaction/parser_ns.cpp	2008-07-25 16:08:10 UTC (rev 33290)
@@ -1011,7 +1011,7 @@
 DECLARE_LOCATION_PARSER(nodes)  {
 	debugC(7, kDebugParser, "LOCATION_PARSER(nodes) ");
 
-	parseWalkNodes(_vm->_location._walkNodes);
+	parsePointList(_vm->_location._walkPoints);
 }
 
 
@@ -1124,8 +1124,8 @@
 	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 @@
 		_script->readLineToken(true);
 	}
 
-	debugC(5, kDebugParser, "parseWalkNodes() done");
+	debugC(5, kDebugParser, "parsePointList() done");
 
 	return;
 }

Modified: scummvm/trunk/engines/parallaction/walk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/walk.cpp	2008-07-25 16:01:25 UTC (rev 33289)
+++ scummvm/trunk/engines/parallaction/walk.cpp	2008-07-25 16:08:10 UTC (rev 33290)
@@ -97,13 +97,13 @@
 
 	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 @@
 			locNode++;
 		}
 
-		if (nearest == _vm->_location._walkNodes.end()) break;
+		if (nearest == _vm->_location._walkPoints.end()) break;
 
 		v20 = *nearest;
 		v34 = v30 = v20.sqrDist(stop);

Modified: scummvm/trunk/engines/parallaction/walk.h
===================================================================
--- scummvm/trunk/engines/parallaction/walk.h	2008-07-25 16:01:25 UTC (rev 33289)
+++ scummvm/trunk/engines/parallaction/walk.h	2008-07-25 16:08:10 UTC (rev 33290)
@@ -45,7 +45,7 @@
 
 	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);


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