FULLPIPE: Mass renaming of AniHandler class

4 files changed, 141 insertions, 141 deletions

diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index 4d7b337d43..d901d74289 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -396,20 +396,20 @@ void sceneHandler04_jumpOnLadder() {
 	g_fp->_aniMan->_flags |= 1;
 
 	AniHandler aniHandler;
-	MGMInfo mgminfo;
+	MakeQueueStruct mkQueue;
 
-	aniHandler.addItem(ANI_MAN);
+	aniHandler.attachObject(ANI_MAN);
 
-	mgminfo.ani = g_fp->_aniMan;
-	mgminfo.staticsId2 = ST_MAN_ONPLANK;
-	mgminfo.x1 = 938;
-	mgminfo.y1 = 442;
-	mgminfo.field_1C = 10;
-	mgminfo.field_10 = 1;
-	mgminfo.flags = 78;
-	mgminfo.movementId = MV_MAN_JUMPONPLANK;
+	mkQueue.ani = g_fp->_aniMan;
+	mkQueue.staticsId2 = ST_MAN_ONPLANK;
+	mkQueue.x1 = 938;
+	mkQueue.y1 = 442;
+	mkQueue.field_1C = 10;
+	mkQueue.field_10 = 1;
+	mkQueue.flags = 78;
+	mkQueue.movementId = MV_MAN_JUMPONPLANK;
 
-	MessageQueue *mq = aniHandler.genMovement(&mgminfo);
+	MessageQueue *mq = aniHandler.makeRunQueue(&mkQueue);
 
 	if (mq) {
 		mq->_flags |= 1;
@@ -461,20 +461,20 @@ void sceneHandler04_dropBottle() {
 
 void sceneHandler04_gotoLadder(ExCommand *ex) {
 	AniHandler aniHandler;
-	MGMInfo mgminfo;
+	MakeQueueStruct mkQueue;
 
-	aniHandler.addItem(ANI_MAN);
+	aniHandler.attachObject(ANI_MAN);
 
-	mgminfo.ani = g_fp->_aniMan;
-	mgminfo.staticsId2 = ST_MAN_UP;
-	mgminfo.x1 = 1095;
-	mgminfo.y1 = 434;
-	mgminfo.field_1C = 12;
-	mgminfo.field_10 = 1;
-	mgminfo.flags = 78;
-	mgminfo.movementId = MV_MAN_PLANKTOLADDER;
+	mkQueue.ani = g_fp->_aniMan;
+	mkQueue.staticsId2 = ST_MAN_UP;
+	mkQueue.x1 = 1095;
+	mkQueue.y1 = 434;
+	mkQueue.field_1C = 12;
+	mkQueue.field_10 = 1;
+	mkQueue.flags = 78;
+	mkQueue.movementId = MV_MAN_PLANKTOLADDER;
 
-	MessageQueue *mq = aniHandler.genMovement(&mgminfo);
+	MessageQueue *mq = aniHandler.makeRunQueue(&mkQueue);
 
 	if (mq) {
 		mq->deleteExCommandByIndex(mq->getCount() - 1, 1);
@@ -551,20 +551,20 @@ void sceneHandler04_raisePlank() {
 
 MessageQueue *sceneHandler04_kozFly3(StaticANIObject *ani, double phase) {
 	AniHandler aniHandler;
-	MGMInfo mgminfo;
+	MakeQueueStruct mkQueue;
 
-	aniHandler.addItem(ANI_KOZAWKA);
+	aniHandler.attachObject(ANI_KOZAWKA);
 
-	mgminfo.ani = ani;
-	mgminfo.staticsId2 = ST_KZW_SIT;
-	mgminfo.x1 = (int)(723.0 - phase * 185.0);
-	mgminfo.y1 = 486;
-	mgminfo.field_1C = 10;
-	mgminfo.field_10 = 1;
-	mgminfo.flags = 78;
-	mgminfo.movementId = MV_KZW_JUMP;
+	mkQueue.ani = ani;
+	mkQueue.staticsId2 = ST_KZW_SIT;
+	mkQueue.x1 = (int)(723.0 - phase * 185.0);
+	mkQueue.y1 = 486;
+	mkQueue.field_1C = 10;
+	mkQueue.field_10 = 1;
+	mkQueue.flags = 78;
+	mkQueue.movementId = MV_KZW_JUMP;
 
-	MessageQueue *mq = aniHandler.genMovement(&mgminfo);
+	MessageQueue *mq = aniHandler.makeRunQueue(&mkQueue);
 
 	if (mq) {
 		ExCommand *ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_STANDUP, 0, 0, 0, 1, 0, 0, 0);
@@ -600,34 +600,34 @@ MessageQueue *sceneHandler04_kozFly3(StaticANIObject *ani, double phase) {
 
 MessageQueue *sceneHandler04_kozFly5(StaticANIObject *ani, double phase) {
 	AniHandler aniHandler;
-	MGMInfo mgminfo;
-
-	aniHandler.addItem(ANI_KOZAWKA);
-
-	mgminfo.ani = ani;
-	mgminfo.staticsId2 = ST_KZW_JUMPOUT;
-	mgminfo.x1 = 525;
-	mgminfo.y1 = (int)(344.0 - (double)(320 - g_vars->scene04_bottle->_oy) * phase);
-	mgminfo.field_1C = 10;
-	mgminfo.field_10 = 1;
-	mgminfo.flags = 78;
-	mgminfo.movementId = MV_KZW_JUMPHIT;
-
-	MessageQueue *mq1 = aniHandler.genMovement(&mgminfo);
-
-	memset(&mgminfo, 0, sizeof(mgminfo));
-	mgminfo.ani = ani;
-	mgminfo.staticsId1 = ST_KZW_JUMPOUT;
-	mgminfo.staticsId2 = ST_KZW_SIT;
-	mgminfo.x2 = 525;
-	mgminfo.y2 = (int)(344.0 - (double)(320 - g_vars->scene04_bottle->_oy) * phase);
-	mgminfo.y1 = 486;
-	mgminfo.field_1C = 10;
-	mgminfo.field_10 = 1;
-	mgminfo.flags = 117;
-	mgminfo.movementId = MV_KZW_JUMPOUT;
-
-	MessageQueue *mq2 = aniHandler.genMovement(&mgminfo);
+	MakeQueueStruct mkQueue;
+
+	aniHandler.attachObject(ANI_KOZAWKA);
+
+	mkQueue.ani = ani;
+	mkQueue.staticsId2 = ST_KZW_JUMPOUT;
+	mkQueue.x1 = 525;
+	mkQueue.y1 = (int)(344.0 - (double)(320 - g_vars->scene04_bottle->_oy) * phase);
+	mkQueue.field_1C = 10;
+	mkQueue.field_10 = 1;
+	mkQueue.flags = 78;
+	mkQueue.movementId = MV_KZW_JUMPHIT;
+
+	MessageQueue *mq1 = aniHandler.makeRunQueue(&mkQueue);
+
+	memset(&mkQueue, 0, sizeof(mkQueue));
+	mkQueue.ani = ani;
+	mkQueue.staticsId1 = ST_KZW_JUMPOUT;
+	mkQueue.staticsId2 = ST_KZW_SIT;
+	mkQueue.x2 = 525;
+	mkQueue.y2 = (int)(344.0 - (double)(320 - g_vars->scene04_bottle->_oy) * phase);
+	mkQueue.y1 = 486;
+	mkQueue.field_1C = 10;
+	mkQueue.field_10 = 1;
+	mkQueue.flags = 117;
+	mkQueue.movementId = MV_KZW_JUMPOUT;
+
+	MessageQueue *mq2 = aniHandler.makeRunQueue(&mkQueue);
 
 	if (mq1 && mq2) {
 		mq1->addExCommandToEnd(mq2->getExCommandByIndex(0)->createClone());
@@ -671,20 +671,20 @@ MessageQueue *sceneHandler04_kozFly5(StaticANIObject *ani, double phase) {
 
 MessageQueue *sceneHandler04_kozFly6(StaticANIObject *ani) {
 	AniHandler aniHandler;
-	MGMInfo mgminfo;
+	MakeQueueStruct mkQueue;
 
-	aniHandler.addItem(ANI_KOZAWKA);
+	aniHandler.attachObject(ANI_KOZAWKA);
 
-	mgminfo.ani = ani;
-	mgminfo.staticsId2 = ST_KZW_SIT;
-	mgminfo.x1 = 397 - 4 * g_fp->_rnd->getRandomNumber(1);
-	mgminfo.field_1C = ani->_priority;
-	mgminfo.y1 = g_vars->scene04_bottle->_oy - 4 * g_fp->_rnd->getRandomNumber(1) + 109;
-	mgminfo.field_10 = 1;
-	mgminfo.flags = 78;
-	mgminfo.movementId = MV_KZW_JUMPROTATE;
+	mkQueue.ani = ani;
+	mkQueue.staticsId2 = ST_KZW_SIT;
+	mkQueue.x1 = 397 - 4 * g_fp->_rnd->getRandomNumber(1);
+	mkQueue.field_1C = ani->_priority;
+	mkQueue.y1 = g_vars->scene04_bottle->_oy - 4 * g_fp->_rnd->getRandomNumber(1) + 109;
+	mkQueue.field_10 = 1;
+	mkQueue.flags = 78;
+	mkQueue.movementId = MV_KZW_JUMPROTATE;
 
-	MessageQueue *mq = aniHandler.genMovement(&mgminfo);
+	MessageQueue *mq = aniHandler.makeRunQueue(&mkQueue);
 
 	if (mq) {
 		mq->deleteExCommandByIndex(mq->getCount() - 1, 1);
@@ -729,20 +729,20 @@ void sceneHandler04_kozMove(Movement *mov, int from, int to, Common::Point *poin
 
 MessageQueue *sceneHandler04_kozFly7(StaticANIObject *ani, double phase) {
 	AniHandler aniHandler;
-	MGMInfo mgminfo;
+	MakeQueueStruct mkQueue;
 
-	aniHandler.addItem(ANI_KOZAWKA);
+	aniHandler.attachObject(ANI_KOZAWKA);
 
-	mgminfo.ani = ani;
-	mgminfo.staticsId2 = 560;
-	mgminfo.x1 = (int)(250.0 - phase * 100.0);
-	mgminfo.y1 = 455;
-	mgminfo.field_1C = 10;
-	mgminfo.field_10 = 1;
-	mgminfo.flags = 78;
-	mgminfo.movementId = MV_KZW_JUMPROTATE;
+	mkQueue.ani = ani;
+	mkQueue.staticsId2 = 560;
+	mkQueue.x1 = (int)(250.0 - phase * 100.0);
+	mkQueue.y1 = 455;
+	mkQueue.field_1C = 10;
+	mkQueue.field_10 = 1;
+	mkQueue.flags = 78;
+	mkQueue.movementId = MV_KZW_JUMPROTATE;
 
-	MessageQueue *mq = aniHandler.genMovement(&mgminfo);
+	MessageQueue *mq = aniHandler.makeRunQueue(&mkQueue);
 
 	if (mq) {
 		sceneHandler04_kozMove(ani->getMovementById(MV_KZW_JUMPROTATE), 1, 9, g_vars->scene04_jumpRotateKozyawki, phase * 0.5 + 1.5);
diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index e152286f48..471436200d 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -251,7 +251,7 @@ void sceneHandler11_manToSwing() {
 	g_vars->scene11_dudeOnSwing->startAnim(MV_MAN11_SWING_0, 0, -1);
 	g_vars->scene11_dudeOnSwing->_movement->setDynamicPhaseIndex(45);
 
-	g_vars->scene11_aniHandler.addItem(g_fp->_aniMan->_id);
+	g_vars->scene11_aniHandler.attachObject(g_fp->_aniMan->_id);
 
 	g_fp->_currentScene->_x = 1400 - g_fp->_sceneRect.right;
 
@@ -385,7 +385,7 @@ void sceneHandler11_emptySwing() {
 }
 
 void sceneHandler11_jumpHitAndWin() {
-	MGMInfo mgminfo;
+	MakeQueueStruct mkQueue;
 
 	sceneHandler11_emptySwing();
 
@@ -393,16 +393,16 @@ void sceneHandler11_jumpHitAndWin() {
 						  MV_MAN11_JUMPHIT, 0);
 	g_fp->_aniMan->_priority = 10;
 
-	mgminfo.field_1C = 10;
-	mgminfo.ani = g_fp->_aniMan;
-	mgminfo.staticsId2 = ST_MAN_1PIX;
-	mgminfo.x1 = 1400;
-	mgminfo.y1 = 0;
-	mgminfo.field_10 = 1;
-	mgminfo.flags = 66;
-	mgminfo.movementId = MV_MAN11_JUMPHIT;
+	mkQueue.field_1C = 10;
+	mkQueue.ani = g_fp->_aniMan;
+	mkQueue.staticsId2 = ST_MAN_1PIX;
+	mkQueue.x1 = 1400;
+	mkQueue.y1 = 0;
+	mkQueue.field_10 = 1;
+	mkQueue.flags = 66;
+	mkQueue.movementId = MV_MAN11_JUMPHIT;
 
-	MessageQueue *mq = g_vars->scene11_aniHandler.genMovement(&mgminfo);
+	MessageQueue *mq = g_vars->scene11_aniHandler.makeRunQueue(&mkQueue);
 
 	if (mq) {
 		g_vars->scene11_crySound = SND_11_024;
@@ -430,7 +430,7 @@ void sceneHandler11_jumpHitAndWin() {
 }
 
 void sceneHandler11_jumpOver(double angle) {
-	MGMInfo mgminfo;
+	MakeQueueStruct mkQueue;
 
 	sceneHandler11_emptySwing();
 
@@ -438,16 +438,16 @@ void sceneHandler11_jumpOver(double angle) {
 						  MV_MAN11_JUMPOVER, 0);
 	g_fp->_aniMan->_priority = 0;
 
-	mgminfo.staticsId2 = ST_MAN_1PIX;
-	mgminfo.ani = g_fp->_aniMan;
-	mgminfo.x1 = 1163;
-	mgminfo.y1 = 837 - (int)(angle * 153.0);
-	mgminfo.field_1C = 0;
-	mgminfo.field_10 = 1;
-	mgminfo.flags = 78;
-	mgminfo.movementId = MV_MAN11_JUMPOVER;
+	mkQueue.staticsId2 = ST_MAN_1PIX;
+	mkQueue.ani = g_fp->_aniMan;
+	mkQueue.x1 = 1163;
+	mkQueue.y1 = 837 - (int)(angle * 153.0);
+	mkQueue.field_1C = 0;
+	mkQueue.field_10 = 1;
+	mkQueue.flags = 78;
+	mkQueue.movementId = MV_MAN11_JUMPOVER;
 
-	MessageQueue *mq = g_vars->scene11_aniHandler.genMovement(&mgminfo);
+	MessageQueue *mq = g_vars->scene11_aniHandler.makeRunQueue(&mkQueue);
 
 	if (mq) {
 		g_vars->scene11_crySound = SND_11_022;
@@ -463,7 +463,7 @@ void sceneHandler11_jumpOver(double angle) {
 }
 
 void sceneHandler11_jumpHit(double angle) {
-	MGMInfo mgminfo;
+	MakeQueueStruct mkQueue;
 
 	sceneHandler11_emptySwing();
 
@@ -478,16 +478,16 @@ void sceneHandler11_jumpHit(double angle) {
 						  MV_MAN11_JUMPOVER, 0);
 	g_fp->_aniMan->_priority = 0;
 
-	mgminfo.staticsId2 = ST_MAN_1PIX;
-	mgminfo.ani = g_fp->_aniMan;
-	mgminfo.x1 = 1017 - (int)(angle * -214.0);
-	mgminfo.y1 = 700;
-	mgminfo.field_1C = 0;
-	mgminfo.field_10 = 1;
-	mgminfo.flags = 78;
-	mgminfo.movementId = MV_MAN11_JUMPHIT;
+	mkQueue.staticsId2 = ST_MAN_1PIX;
+	mkQueue.ani = g_fp->_aniMan;
+	mkQueue.x1 = 1017 - (int)(angle * -214.0);
+	mkQueue.y1 = 700;
+	mkQueue.field_1C = 0;
+	mkQueue.field_10 = 1;
+	mkQueue.flags = 78;
+	mkQueue.movementId = MV_MAN11_JUMPHIT;
 
-	MessageQueue *mq = g_vars->scene11_aniHandler.genMovement(&mgminfo);
+	MessageQueue *mq = g_vars->scene11_aniHandler.makeRunQueue(&mkQueue);
 
 	if (mq) {
 		g_vars->scene11_crySound = SND_11_022;
diff --git a/engines/fullpipe/scenes/scene22.cpp b/engines/fullpipe/scenes/scene22.cpp
index ce060dce49..84cd5f9a9a 100644
--- a/engines/fullpipe/scenes/scene22.cpp
+++ b/engines/fullpipe/scenes/scene22.cpp
@@ -240,22 +240,22 @@ void sceneHandler22_stoolLogic(ExCommand *cmd) {
 				}
 
 				AniHandler mgm;
-				MGMInfo mgminfo;
-
-				mgm.addItem(ANI_MAN);
-				mgminfo.ani = g_fp->_aniMan;
-				mgminfo.staticsId2 = ST_MAN_RIGHT;
-				mgminfo.x1 = 934;
-				mgminfo.y1 = 391;
-				mgminfo.field_1C = 10;
-				mgminfo.staticsId1 = 0x4145;
-				mgminfo.x2 = 981;
-				mgminfo.y2 = 390;
-				mgminfo.field_10 = 1;
-				mgminfo.flags = 127;
-				mgminfo.movementId = rMV_MAN_TURN_SRL;
-
-				mq = mgm.genMovement(&mgminfo);
+				MakeQueueStruct mkQueue;
+
+				mgm.attachObject(ANI_MAN);
+				mkQueue.ani = g_fp->_aniMan;
+				mkQueue.staticsId2 = ST_MAN_RIGHT;
+				mkQueue.x1 = 934;
+				mkQueue.y1 = 391;
+				mkQueue.field_1C = 10;
+				mkQueue.staticsId1 = 0x4145;
+				mkQueue.x2 = 981;
+				mkQueue.y2 = 390;
+				mkQueue.field_10 = 1;
+				mkQueue.flags = 127;
+				mkQueue.movementId = rMV_MAN_TURN_SRL;
+
+				mq = mgm.makeRunQueue(&mkQueue);
 
 				ExCommand *ex = mq->getExCommandByIndex(0);
 
diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index c68553c490..28d06964a9 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -487,23 +487,23 @@ bool sceneHandler29_checkGreenBallHit(StaticANIObject *ani, int maxx) {
 }
 
 void sceneHandler29_manHit() {
-	MGMInfo mgminfo;
+	MakeQueueStruct mkQueue;
 
 	g_vars->scene29_manIsHit = true;
 
 	g_fp->_aniMan->changeStatics2(ST_MAN29_RUNR);
 	g_fp->_aniMan->setOXY(g_vars->scene29_manX, g_vars->scene29_manY);
 
-	mgminfo.ani = g_fp->_aniMan;
-	mgminfo.staticsId2 = ST_MAN29_SITR;
-	mgminfo.y1 = 463;
-	mgminfo.x1 = g_vars->scene29_manX <= 638 ? 351 : 0;
-	mgminfo.field_1C = 10;
-	mgminfo.field_10 = 1;
-	mgminfo.flags = (g_vars->scene29_manX <= 638 ? 2 : 0) | 0x44;
-	mgminfo.movementId = MV_MAN29_HIT;
+	mkQueue.ani = g_fp->_aniMan;
+	mkQueue.staticsId2 = ST_MAN29_SITR;
+	mkQueue.y1 = 463;
+	mkQueue.x1 = g_vars->scene29_manX <= 638 ? 351 : 0;
+	mkQueue.field_1C = 10;
+	mkQueue.field_10 = 1;
+	mkQueue.flags = (g_vars->scene29_manX <= 638 ? 2 : 0) | 0x44;
+	mkQueue.movementId = MV_MAN29_HIT;
 
-	MessageQueue *mq = g_vars->scene29_aniHandler.genMovement(&mgminfo);
+	MessageQueue *mq = g_vars->scene29_aniHandler.makeRunQueue(&mkQueue);
 	ExCommand *ex;
 
 	if (mq) {
@@ -728,7 +728,7 @@ void sceneHandler29_manToL() {
 
 	g_vars->scene29_arcadeIsOn = true;
 
-	g_vars->scene29_aniHandler.addItem(g_fp->_aniMan->_id);
+	g_vars->scene29_aniHandler.attachObject(g_fp->_aniMan->_id);
 
 	g_fp->_updateScreenCallback = sceneHandler29_updateScreenCallback;