[Scummvm-cvs-logs] scummvm master -> 53c0d28dd80f970b740c9d0782a7c4da2a0b9b6e

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
53c0d28dd8 FULLPIPE: Renames in MovGraph class


Commit: 53c0d28dd80f970b740c9d0782a7c4da2a0b9b6e
    https://github.com/scummvm/scummvm/commit/53c0d28dd80f970b740c9d0782a7c4da2a0b9b6e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-07-25T00:11:04+03:00

Commit Message:
FULLPIPE: Renames in MovGraph class

Changed paths:
    engines/fullpipe/messagehandlers.cpp
    engines/fullpipe/motion.cpp
    engines/fullpipe/motion.h



diff --git a/engines/fullpipe/messagehandlers.cpp b/engines/fullpipe/messagehandlers.cpp
index 4e791a3..caaa8f3 100644
--- a/engines/fullpipe/messagehandlers.cpp
+++ b/engines/fullpipe/messagehandlers.cpp
@@ -765,7 +765,7 @@ int MovGraph_messageHandler(ExCommand *cmd) {
 		point.x = ani->_ox;
 		point.y = ani->_oy;
 
-		double dst = gr->calcDistance(&point, (MovGraphLink *)(*i), 0);
+		double dst = gr->putToLink(&point, (MovGraphLink *)(*i), 0);
 		if (dst >= 0.0 && dst < mindistance) {
 			mindistance = dst;
 			link = (MovGraphLink *)(*i);
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 47cf524..ceb3208 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -1283,7 +1283,7 @@ MessageQueue *MovGraph::method50(StaticANIObject *ani, MovArr *movarr, int stati
 	return mq;
 }
 
-double MovGraph::calcDistance(Common::Point *point, MovGraphLink *link, int fuzzyMatch) {
+double MovGraph::putToLink(Common::Point *point, MovGraphLink *link, int fuzzyMatch) {
 	int n1x = link->_graphSrc->_x;
 	int n1y = link->_graphSrc->_y;
 	int n2x = link->_graphDst->_x;
@@ -1409,7 +1409,7 @@ Common::Array<MovArr *> *MovGraph::getHitPoints(int x, int y, int *arrSize, int
 
 		if (flag1) {
 			Common::Point point(x, y);
-			double dist = calcDistance(&point, lnk, 0);
+			double dist = putToLink(&point, lnk, 0);
 
 			if (dist >= 0.0 && dist < 2.0) {
 				movarr = new MovArr;
@@ -1450,7 +1450,7 @@ Common::Array<MovArr *> *MovGraph::getHitPoints(int x, int y, int *arrSize, int
 						movarr->_point.x = x;
 						movarr->_point.y = y;
 
-						calcDistance(&movarr->_point, lnk, 0);
+						putToLink(&movarr->_point, lnk, 0);
 
 						arr->push_back(movarr);
 					}
@@ -2261,7 +2261,7 @@ MessageQueue *MovGraph2::doWalkTo(StaticANIObject *obj, int xpos, int ypos, int
 
 		movInfo1.distance2 = (int)(nod->_z + (dst1 * (double)dst / linkInfoDest.link->_length));
 
-		calcDistance(&movInfo1.pt2, linkInfoDest.link, 1);
+		putToLink(&movInfo1.pt2, linkInfoDest.link, 1);
 
 		dx1 = movInfo1.pt1.x;
 		dy1 = movInfo1.pt1.y;
@@ -2619,7 +2619,7 @@ MovGraphLink *MovGraph2::findLink1(int x, int y, int idx, int fuzzyMatch) {
 		if (fuzzyMatch) {
 			point.x = x;
 			point.y = y;
-			double dst = calcDistance(&point, lnk, 0);
+			double dst = putToLink(&point, lnk, 0);
 
 			if (dst >= 0.0 && dst < 2.0)
 				return lnk;
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index b8c3ff1..41860e3 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -302,7 +302,7 @@ public:
 	virtual MessageQueue *doWalkTo(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId);
 	virtual MessageQueue *method50(StaticANIObject *ani, MovArr *movarr, int staticsId);
 
-	double calcDistance(Common::Point *point, MovGraphLink *link, int fuzzyMatch);
+	double putToLink(Common::Point *point, MovGraphLink *link, int fuzzyMatch);
 	void recalcLinkParams();
 	bool getNearestPoint(int unusedArg, Common::Point *p, MovArr *movarr);
 	MovGraphNode *calcOffset(int ox, int oy);