Merge branch 'master' into xeen

1 files changed, 32 insertions, 32 deletions

diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp
index 1fa5cabc15..1a8fa8ed67 100644
--- a/engines/fullpipe/scenes/scene11.cpp
+++ b/engines/fullpipe/scenes/scene11.cpp
@@ -96,7 +96,7 @@ void scene11_setupMusic() {
 void scene11_initScene(Scene *sc) {
 	g_vars->scene11_swingie = sc->getStaticANIObject1ById(ANI_SWINGER, -1);
 	g_vars->scene11_boots = sc->getStaticANIObject1ById(ANI_BOOTS_11, -1);
-	g_vars->scene11_mgm.clear();
+	g_vars->scene11_aniHandler.detachAllObjects();
 	g_vars->scene11_dudeOnSwing = sc->getStaticANIObject1ById(ANI_MAN11, -1);
 	g_vars->scene11_dudeOnSwing->_callback2 = scene11_dudeSwingCallback;
 	g_vars->scene11_dudeOnSwing = sc->getStaticANIObject1ById(ANI_KACHELI, -1);
@@ -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_mgm.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_mgm.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_mgm.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_mgm.genMovement(&mgminfo);
+	MessageQueue *mq = g_vars->scene11_aniHandler.makeRunQueue(&mkQueue);
 
 	if (mq) {
 		g_vars->scene11_crySound = SND_11_022;