FULLPIPE: Fix MovGraph::calcMovItems()

scummvm · May 25, 2014 · 3ca0f88 · 3ca0f88
1 parent 0066907
commit 3ca0f88
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
@@ -1176,7 +1176,7 @@ void MovGraph::shuffleTree(MovGraphLink *lnk, MovGraphLink *lnk2, Common::Array<
 	}
 }
 
-Common::Array<Common::Rect *> *MovGraph::getBboxes(MovArr *movarr1, MovArr *movarr2, int *listCount) {
+Common::Array<MovItem *> *MovGraph::calcMovItems(MovArr *movarr1, MovArr *movarr2, int *listCount) {
 	Common::Array<MovGraphLink *> tempObList1;
 	Common::Array<MovGraphLink *> tempObList2;
 
@@ -1189,12 +1189,12 @@ Common::Array<Common::Rect *> *MovGraph::getBboxes(MovArr *movarr1, MovArr *mova
 
 	*listCount = tempObList2.size();
 
-	Common::Array<Common::Rect *> *res = new Common::Array<Common::Rect *>;
+	Common::Array<MovItem *> *res = new Common::Array<MovItem *>;
 
 	for (int i = 0; i < *listCount; i++) {
-		Common::Rect *r = new Common::Rect;
+		MovItem *r = new MovItem;
 
-		calcBbox(r, tempObList2[i], movarr1, movarr2);
+		genMovItem(r, tempObList2[i], movarr1, movarr2);
 
 		delete tempObList2[i];
 	}
@@ -1204,8 +1204,8 @@ Common::Array<Common::Rect *> *MovGraph::getBboxes(MovArr *movarr1, MovArr *mova
 	return res;
 }
 
-void MovGraph::calcBbox(Common::Rect *rect, MovGraphLink *grlink, MovArr *movarr1, MovArr *movarr2) {
-	warning("STUB: MovGraph::calcBbox()");
+void MovGraph::genMovItem(MovItem *movitem, MovGraphLink *grlink, MovArr *movarr1, MovArr *movarr2) {
+	warning("STUB: MovGraph::genMovItem()");
 }
 
 bool MovGraph::calcChunk(int idx, int x, int y, MovArr *arr, int a6) {

diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
@@ -371,8 +371,8 @@ class MovGraph : public MotionController {
 	int getItemIndexByStaticAni(StaticANIObject *ani);
 	Common::Array<MovArr *> *genMovArr(int x, int y, int *arrSize, int flag1, int flag2);
 	void shuffleTree(MovGraphLink *lnk, MovGraphLink *lnk2, Common::Array<MovGraphLink *> &tempObList1, Common::Array<MovGraphLink *> &tempObList2);
-	Common::Array<Common::Rect *> *getBboxes(MovArr *movarr1, MovArr *movarr2, int *listCount);
-	void calcBbox(Common::Rect *rect, MovGraphLink *grlink, MovArr *movarr1, MovArr *movarr2);
+	Common::Array<MovItem *> *calcMovItems(MovArr *movarr1, MovArr *movarr2, int *listCount);
+	void genMovItem(MovItem *movitem, MovGraphLink *grlink, MovArr *movarr1, MovArr *movarr2);
 	bool calcChunk(int idx, int x, int y, MovArr *arr, int a6);
 	MessageQueue *sub1(StaticANIObject *ani, int x, int y, int a5, int x1, int y1, int a8, int a9);
 	MessageQueue *fillMGMinfo(StaticANIObject *ani, MovArr *movarr, int staticsId);