[Scummvm-cvs-logs] scummvm master -> 4bcbd7890945615a62cbee0c6600d9d2c356df5d

sev- sev at scummvm.org
Mon Oct 21 23:41:42 CEST 2013


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:
4bcbd78909 FULLPIPE: Implement MovGraph2::getShortSide()


Commit: 4bcbd7890945615a62cbee0c6600d9d2c356df5d
    https://github.com/scummvm/scummvm/commit/4bcbd7890945615a62cbee0c6600d9d2c356df5d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-10-21T14:41:06-07:00

Commit Message:
FULLPIPE: Implement MovGraph2::getShortSide()

Changed paths:
    engines/fullpipe/motion.cpp



diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index a6d32cf..94635a3 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -924,9 +924,17 @@ MovGraphNode *MovGraph2::findNode(int x, int y, int fuzzyMatch) {
 }
 
 int MovGraph2::getShortSide(MovGraphLink *lnk, int x, int y) {
-	warning("STUB: MovGraph2::getShortSide()");
+	bool cond;
 
-	return 0;
+	if (lnk)
+		cond = abs(lnk->_movGraphNode2->_x - lnk->_movGraphNode1->_x) > abs(lnk->_movGraphNode2->_y - lnk->_movGraphNode1->_y);
+	else
+		cond = abs(x) > abs(y);
+
+	if (cond)
+		return x <= 0;
+	else
+		return ((y > 0) + 2);
 }
 
 int MovGraph2::findLink(Common::Array<MovGraphLink *> *linkList, int idx, Common::Rect *rect, Common::Point *point) {






More information about the Scummvm-git-logs mailing list