[Scummvm-cvs-logs] scummvm master -> c5828a41f4cdd2f37f01d463bcf295265965b80b

[sev-]

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

Summary:
cb5bf0796e FULLPIPE: Fix always false condition check in MctlGraph::generateList
c5828a41f4 FULLPIPE: Inverse search mode behavior in MctlGraph::getHitNode


Commit: cb5bf0796e1af8413a2aab137d6315cc498c0417
    https://github.com/scummvm/scummvm/commit/cb5bf0796e1af8413a2aab137d6315cc498c0417
Author: Retro-Junk (bambarbee at yandex.ru)
Date: 2016-08-22T22:21:49+02:00

Commit Message:
FULLPIPE: Fix always false condition check in MctlGraph::generateList

Changed paths:
    engines/fullpipe/motion.cpp



diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 99c2189..4a08b4e 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -1932,7 +1932,7 @@ void MctlGraph::generateList(MctlMQ *movinfo, Common::Array<MovGraphLink *> *lin
 
 			movinfo->items.push_back(elem);
 
-			if (i == linkList->size()) {
+			if (i == linkList->size() - 1) {
 				elem = new MctlMQSub;
 				elem->subIndex = prevSubIndex;
 				elem->x = movinfo->pt2.x;


Commit: c5828a41f4cdd2f37f01d463bcf295265965b80b
    https://github.com/scummvm/scummvm/commit/c5828a41f4cdd2f37f01d463bcf295265965b80b
Author: Retro-Junk (bambarbee at yandex.ru)
Date: 2016-08-22T22:22:00+02:00

Commit Message:
FULLPIPE: Inverse search mode behavior in MctlGraph::getHitNode

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



diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 4a08b4e..d3b29b3 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -2400,13 +2400,13 @@ MessageQueue *MctlGraph::makeQueue(StaticANIObject *obj, int xpos, int ypos, int
 	return mq;
 }
 
-MovGraphNode *MctlGraph::getHitNode(int x, int y, int fuzzyMatch) {
+MovGraphNode *MctlGraph::getHitNode(int x, int y, int strictMatch) {
 	for (ObList::iterator i = _nodes.begin(); i != _nodes.end(); ++i) {
 		assert(((CObject *)*i)->_objtype == kObjTypeMovGraphNode);
 
 		MovGraphNode *node = (MovGraphNode *)*i;
 
-		if (fuzzyMatch) {
+		if (!strictMatch) {
 			if (abs(node->_x - x) < 15 && abs(node->_y - y) < 15)
 				return node;
 		} else {
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index 207ce2f..93b57c7 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -392,7 +392,7 @@ public:
 	void generateList(MctlMQ *movinfo, Common::Array<MovGraphLink *> *linkList, LinkInfo *lnkSrc, LinkInfo *lnkDst);
 	MessageQueue *makeWholeQueue(MctlMQ *mctlMQ);
 
-	MovGraphNode *getHitNode(int x, int y, int fuzzyMatch);
+	MovGraphNode *getHitNode(int x, int y, int strictMatch);
 	MovGraphLink *getHitLink(int x, int y, int idx, int fuzzyMatch);
 	MovGraphLink *getNearestLink(int x, int y);
 	double iterate(LinkInfo *linkInfoSource, LinkInfo *linkInfoDest, Common::Array<MovGraphLink *> *listObj);