FULLPIPE: MovGraph2::method4C() con't

1 files changed, 32 insertions, 27 deletions

diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index 86e5d383be..f55333edea 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -52,13 +52,13 @@ public:
 	virtual int method28() { return 0; }
 	virtual int method2C() { return 0; }
 	virtual int method30() { return 0; }
-	virtual MessageQueue *method34(StaticANIObject *subj, int xpos, int ypos, int fuzzySearch, int staticsId) { return 0; }
+	virtual MessageQueue *method34(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId) { return 0; }
 	virtual int changeCallback() { return 0; }
 	virtual int method3C() { return 0; }
 	virtual int method40() { return 0; }
 	virtual int method44() { return 0; }
 	virtual int method48() { return -1; }
-	virtual MessageQueue *method4C(StaticANIObject *subj, int xpos, int ypos, int fuzzySearch, int staticsId) { return 0; }
+	virtual MessageQueue *method4C(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId) { return 0; }
 };
 
 class MovGraphReact : public CObject {
@@ -106,8 +106,8 @@ class MctlCompound : public MotionController {
 	virtual void addObject(StaticANIObject *obj);
 	virtual int removeObject(StaticANIObject *obj);
 	virtual void freeItems();
-	virtual MessageQueue *method34(StaticANIObject *subj, int xpos, int ypos, int fuzzySearch, int staticsId);
-	virtual MessageQueue *method4C(StaticANIObject *subj, int xpos, int ypos, int fuzzySearch, int staticsId);
+	virtual MessageQueue *method34(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId);
+	virtual MessageQueue *method4C(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId);
 
 	void initMovGraph2();
 	MctlConnectionPoint *findClosestConnectionPoint(int ox, int oy, int destIndex, int connectionX, int connectionY, int sourceIndex, int *minDistancePtr);
@@ -247,14 +247,14 @@ class MovGraph : public MotionController {
 	virtual void freeItems();
 	virtual int method28();
 	virtual int method2C();
-	virtual MessageQueue *method34(StaticANIObject *subj, int xpos, int ypos, int fuzzySearch, int staticsId);
+	virtual MessageQueue *method34(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId);
 	virtual int changeCallback();
 	virtual int method3C();
 	virtual int method44();
-	virtual MessageQueue *method4C(StaticANIObject *subj, int xpos, int ypos, int fuzzySearch, int staticsId);
+	virtual MessageQueue *method4C(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId);
 	virtual int method50();
 
-	double calcDistance(Common::Point *point, MovGraphLink *link, int fuzzySearch);
+	double calcDistance(Common::Point *point, MovGraphLink *link, int fuzzyMatch);
 	MovGraphNode *calcOffset(int ox, int oy);
 };
 
@@ -275,6 +275,24 @@ struct MovGraph2ItemSub {
 	MG2I _turnS[4];
 };
 
+struct LinkInfo {
+	MovGraphLink *link;
+	MovGraphNode *node;
+};
+
+struct MovInfo1 {
+	int field_0;
+	Common::Point pt1;
+	Common::Point pt2;
+	int distance1;
+	int distance2;
+	int subIndex;
+	int item1Index;
+	int items;
+	int itemsCount;
+	int flags;
+};
+
 struct MovGraph2Item {
 	int _objectId;
 	StaticANIObject *_obj;
@@ -289,8 +307,8 @@ public:
 	virtual void addObject(StaticANIObject *obj);
 	virtual int removeObject(StaticANIObject *obj);
 	virtual void freeItems();
-	virtual MessageQueue *method34(StaticANIObject *subj, int xpos, int ypos, int fuzzySearch, int staticsId);
-	virtual MessageQueue *method4C(StaticANIObject *subj, int xpos, int ypos, int fuzzySearch, int staticsId);
+	virtual MessageQueue *method34(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId);
+	virtual MessageQueue *method4C(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId);
 
 	int getItemIndexByGameObjectId(int objectId);
 	int getItemSubIndexByStaticsId(int index, int staticsId);
@@ -298,6 +316,11 @@ public:
 	int getItemSubIndexByMGM(int idx, StaticANIObject *ani);
 
 	bool initDirections(StaticANIObject *obj, MovGraph2Item *item);
+
+	MovGraphNode *findNode(int x, int y, int fuzzyMatch);
+	MovGraphLink *findLink1(int x, int y, int idx, int fuzzyMatch);
+	MovGraphLink *findLink2(int x, int y);
+	double findMinPath(LinkInfo *linkInfoSource, LinkInfo *linkInfoDest, Common::Array<MovGraphLink *> *listObj);
 };
 
 class MctlConnectionPoint : public CObject {
@@ -312,24 +335,6 @@ public:
 	int _motionControllerObj;
 };
 
-struct LinkInfo {
-	int link;
-	int node;
-};
-
-struct MovInfo1 {
-	int field_0;
-	Common::Point pt1;
-	Common::Point pt2;
-	int distance1;
-	int distance2;
-	int subIndex;
-	int item1Index;
-	int items;
-	int itemsCount;
-	int flags;
-};
-
 } // End of namespace Fullpipe
 
 #endif /* FULLPIPE_MOTION_H */