FULLPIPE: Implemented MctlCompound::initMovGraph2()

1 files changed, 43 insertions, 21 deletions

diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index b0bfe92d1f..2db3db6676 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -57,12 +57,31 @@ public:
 	virtual MessageQueue *method4C(StaticANIObject *subj, int xpos, int ypos, int flag, int staticsId) { return 0; }
 };
 
-class MctlCompoundArray : public Common::Array<CObject>, public CObject {
+class MovGraphReact : public CObject {
+	// Empty
+};
+
+class MctlConnectionPointsArray : public Common::Array<CObject>, public CObject {
  public:
 	virtual bool load(MfcArchive &file);
 };
 
-class MctlConnectionPointsArray : public Common::Array<CObject>, public CObject {
+class MctlCompoundArrayItem : public CObject {
+	friend class MctlCompound;
+
+  protected:
+	MotionController *_motionControllerObj;
+	MovGraphReact *_movGraphReactObj;
+	MctlConnectionPointsArray _connectionPoints;
+	int _field_20;
+	int _field_24;
+	int _field_28;
+
+ public:
+	MctlCompoundArrayItem() : _movGraphReactObj(0) {}
+};
+
+class MctlCompoundArray : public Common::Array<MctlCompoundArrayItem *>, public CObject {
  public:
 	virtual bool load(MfcArchive &file);
 };
@@ -105,25 +124,6 @@ class MovGraphNode : public CObject {
 	virtual bool load(MfcArchive &file);
 };
 
-class MovGraphReact : public CObject {
-	// Empty
-};
-
-class MctlCompoundArrayItem : public CObject {
-	friend class MctlCompound;
-
-  protected:
-	MotionController *_motionControllerObj;
-	MovGraphReact *_movGraphReactObj;
-	MctlConnectionPointsArray _connectionPoints;
-	int _field_20;
-	int _field_24;
-	int _field_28;
-
- public:
-	MctlCompoundArrayItem() : _movGraphReactObj(0) {}
-};
-
 class ReactParallel : public MovGraphReact {
 	//CRgn _rgn;
 	int _x1;
@@ -187,11 +187,33 @@ class MovGraph : public MotionController {
 	virtual bool load(MfcArchive &file);
 
 	virtual int addObject(StaticANIObject *obj);
+	virtual int removeObject(StaticANIObject *obj);
+	virtual void freeItems();
+	virtual int method28();
+	virtual int method2C();
+	virtual MessageQueue *method34(StaticANIObject *subj, int xpos, int ypos, int flag, int staticsId);
+	virtual int changeCallback();
+	virtual int method3C();
+	virtual int method44();
+	virtual MessageQueue *method4C(StaticANIObject *subj, int xpos, int ypos, int flag, int staticsId);
+	virtual int method50();
 
 	double calcDistance(Common::Point *point, MovGraphLink *link, int flag);
 	MovGraphNode *calcOffset(int ox, int oy);
 };
 
+class MovGraph2 : public MovGraph {
+public:
+	ObArray _items;
+
+public:
+	virtual int addObject(StaticANIObject *obj);
+	virtual int removeObject(StaticANIObject *obj);
+	virtual void freeItems();
+	virtual MessageQueue *method34(StaticANIObject *subj, int xpos, int ypos, int flag, int staticsId);
+	virtual MessageQueue *method4C(StaticANIObject *subj, int xpos, int ypos, int flag, int staticsId);
+};
+
 class MctlConnectionPoint : public CObject {
 	int _connectionX;
 	int _connectionY;