FULLPIPE: Rename various mgm variables to aniHandler

9 files changed, 61 insertions, 61 deletions

diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index f62fde2e03..22f2050d16 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -140,7 +140,7 @@ FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc)
 	_scene3 = 0;
 	_movTable = 0;
 	_floaters = 0;
-	_mgm = 0;
+	_aniHandler = 0;
 
 	_globalMessageQueueList = 0;
 	_messageHandlers = 0;
@@ -217,7 +217,7 @@ void FullpipeEngine::initialize() {
 	_sceneRect.bottom = 599;
 
 	_floaters = new Floaters;
-	_mgm = new AniHandler;
+	_aniHandler = new AniHandler;
 }
 
 void FullpipeEngine::restartGame() {
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index 6b57eb1c5e..d9ab2aaa85 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -210,7 +210,7 @@ public:
 	MovTable *_movTable;
 
 	Floaters *_floaters;
-	AniHandler *_mgm;
+	AniHandler *_aniHandler;
 
 	Common::Array<Common::Point *> _arcadeKeys;
 
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index ff0a6caff3..f2d3a65feb 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -348,7 +348,7 @@ void MctlLadder::attachObject(StaticANIObject *obj) {
 		MctlLadderMovement *movement = new MctlLadderMovement;
 
 		if (initMovement(obj, movement)) {
-			_mgm.addItem(obj->_id);
+			_aniHandler.addItem(obj->_id);
 			_ladmovements.push_back(movement);
 		} else {
 			delete movement;
@@ -413,7 +413,7 @@ bool MctlLadder::initMovement(StaticANIObject *ani, MctlLadderMovement *movement
 void MctlLadder::detachAllObjects() {
 	debugC(4, kDebugPathfinding, "MctlLadder::detachAllObjects()");
 
-	_mgm.clear();
+	_aniHandler.clear();
 
 	for (uint i = 0; i < _ladmovements.size(); i++) {
 		delete _ladmovements[i]->movVars;
@@ -497,7 +497,7 @@ MessageQueue *MctlLadder::doWalkTo(StaticANIObject *ani, int xpos, int ypos, int
 		mgminfo.flags = 14;
 		mgminfo.movementId = direction ? _ladmovements[pos]->movVars->varDownGo : _ladmovements[pos]->movVars->varUpGo;
 
-		return _mgm.genMovement(&mgminfo);
+		return _aniHandler.genMovement(&mgminfo);
 	}
 
 	if (ani->_statics->_staticsId == _ladmovements[pos]->staticIds[2]) {
@@ -515,7 +515,7 @@ MessageQueue *MctlLadder::doWalkTo(StaticANIObject *ani, int xpos, int ypos, int
 			mgminfo.flags = 14;
 			mgminfo.movementId = _ladmovements[pos]->movVars->varUpGo;
 
-			return _mgm.genMovement(&mgminfo);
+			return _aniHandler.genMovement(&mgminfo);
 		}
 
 		int ox = ani->_ox;
@@ -539,7 +539,7 @@ MessageQueue *MctlLadder::doWalkTo(StaticANIObject *ani, int xpos, int ypos, int
 		mgminfo.staticsId1 = _ladmovements[pos]->staticIds[0];
 		mgminfo.movementId = _ladmovements[pos]->movVars->varDownGo;
 
-		mq = _mgm.genMovement(&mgminfo);
+		mq = _aniHandler.genMovement(&mgminfo);
 
 		ex = new ExCommand(ani->_id, 1, _ladmovements[pos]->movVars->varUpStop, 0, 0, 0, 1, 0, 0, 0);
 		ex->_keyCode = ani->_okeyCode;
@@ -551,7 +551,7 @@ MessageQueue *MctlLadder::doWalkTo(StaticANIObject *ani, int xpos, int ypos, int
 	}
 
 	if (ani->_statics->_staticsId != _ladmovements[pos]->staticIds[3]) {
-		mq = _mgm.genMQ(ani, _ladmovements[pos]->staticIds[0], 0, 0, 0);
+		mq = _aniHandler.genMQ(ani, _ladmovements[pos]->staticIds[0], 0, 0, 0);
 
 		if (!mq)
 			return 0;
@@ -559,7 +559,7 @@ MessageQueue *MctlLadder::doWalkTo(StaticANIObject *ani, int xpos, int ypos, int
 		int nx = ani->_ox;
 		int ny = ani->_oy;
 
-		_mgm.getPoint(&point, ani->_id, ani->_statics->_staticsId, _ladmovements[pos]->staticIds[0]);
+		_aniHandler.getPoint(&point, ani->_id, ani->_statics->_staticsId, _ladmovements[pos]->staticIds[0]);
 
 		nx += point.x;
 		ny += point.y;
@@ -605,7 +605,7 @@ MessageQueue *MctlLadder::doWalkTo(StaticANIObject *ani, int xpos, int ypos, int
 		mgminfo.staticsId1 = _ladmovements[pos]->staticIds[1];
 		mgminfo.movementId = _ladmovements[pos]->movVars->varUpGo;
 
-		mq = _mgm.genMovement(&mgminfo);
+		mq = _aniHandler.genMovement(&mgminfo);
 
 		ex = new ExCommand(ani->_id, 1, _ladmovements[pos]->movVars->varDownStop, 0, 0, 0, 1, 0, 0, 0);
 		ex->_keyCode = ani->_okeyCode;
@@ -630,7 +630,7 @@ MessageQueue *MctlLadder::doWalkTo(StaticANIObject *ani, int xpos, int ypos, int
 	mgminfo.flags = 14;
 	mgminfo.movementId = _ladmovements[pos]->movVars->varDownGo;
 
-   return _mgm.genMovement(&mgminfo);
+   return _aniHandler.genMovement(&mgminfo);
 }
 
 MessageQueue *MctlLadder::controllerWalkTo(StaticANIObject *ani, int off) {
@@ -806,8 +806,8 @@ bool MovGraph::load(MfcArchive &file) {
 void MovGraph::attachObject(StaticANIObject *obj) {
 	debugC(4, kDebugPathfinding, "MovGraph::attachObject(*%d)", obj->_id);
 
-	_mgm.clear();
-	_mgm.addItem(obj->_id);
+	_aniHandler.clear();
+	_aniHandler.addItem(obj->_id);
 
 	for (uint i = 0; i < _items.size(); i++)
 		if (_items[i]->ani == obj)
@@ -819,7 +819,7 @@ void MovGraph::attachObject(StaticANIObject *obj) {
 
 	_items.push_back(item);
 
-	_mgm.addItem(obj->_id); // FIXME: Is it really needed?
+	_aniHandler.addItem(obj->_id); // FIXME: Is it really needed?
 }
 
 int MovGraph::detachObject(StaticANIObject *obj) {
@@ -1008,8 +1008,8 @@ bool MovGraph::resetPosition(StaticANIObject *ani, int flag) {
 		Statics *st;
 
 		if (ani->_statics) {
-			int t = _mgm.refreshOffsets(ani->_id, ani->_statics->_staticsId, movarr._link->_dwordArray2[_field_44]);
-			if (t > _mgm.refreshOffsets(ani->_id, ani->_statics->_staticsId, movarr._link->_dwordArray2[_field_44 + 1]))
+			int t = _aniHandler.refreshOffsets(ani->_id, ani->_statics->_staticsId, movarr._link->_dwordArray2[_field_44]);
+			if (t > _aniHandler.refreshOffsets(ani->_id, ani->_statics->_staticsId, movarr._link->_dwordArray2[_field_44 + 1]))
 				st = ani->getStaticsById(movarr._link->_dwordArray2[_field_44 + 1]);
 			else
 				st = ani->getStaticsById(movarr._link->_dwordArray2[_field_44]);
@@ -1247,7 +1247,7 @@ MessageQueue *MovGraph::makeWholeQueue(StaticANIObject *ani, MovArr *movarr, int
 		if (mq)
 			mgminfo.flags |= 0x31;
 
-		MessageQueue *newmq = _mgm.genMovement(&mgminfo);
+		MessageQueue *newmq = _aniHandler.genMovement(&mgminfo);
 
 		if (mq) {
 			if (newmq) {
@@ -1608,14 +1608,14 @@ bool MovGraph::getHitPoint(int idx, int x, int y, MovArr *arr, int a6) {
 	int offmin = 100;
 
 	for (int i = 0; i < arrSize; i++) {
-		int off = _mgm.refreshOffsets(_items[idx]->ani->_id, staticsId, (*movarr)[i]->_link->_dwordArray2[_field_44]);
+		int off = _aniHandler.refreshOffsets(_items[idx]->ani->_id, staticsId, (*movarr)[i]->_link->_dwordArray2[_field_44]);
 
 		if (off < offmin) {
 			offmin = off;
 			idxmin = i;
 		}
 
-		off = _mgm.refreshOffsets(_items[idx]->ani->_id, staticsId, (*movarr)[i]->_link->_dwordArray2[_field_44 + 1]);
+		off = _aniHandler.refreshOffsets(_items[idx]->ani->_id, staticsId, (*movarr)[i]->_link->_dwordArray2[_field_44 + 1]);
 		if (off < offmin) {
 			offmin = off;
 			idxmin = i;
@@ -1689,7 +1689,7 @@ int MovGraph2::getItemSubIndexByMGM(int index, StaticANIObject *ani) {
 
 		for (int i = 0; i < 4; i++) {
 			debugC(1, kDebugPathfinding, "WWW 5");
-			int tmp = _mgm.refreshOffsets(ani->_id, ani->_statics->_staticsId, _items2[index]->_subItems[i]._staticsId1);
+			int tmp = _aniHandler.refreshOffsets(ani->_id, ani->_statics->_staticsId, _items2[index]->_subItems[i]._staticsId1);
 
 			if (tmp >= 0 && (minidx == -1 || tmp < min)) {
 				minidx = i;
@@ -2023,7 +2023,7 @@ MessageQueue *MovGraph2::buildMovInfo1MessageQueue(MovInfo1 *movInfo) {
 				mgminfo.flags = 0x7f;
 				mgminfo.movementId = mg2i->_movementId;
 
-				MessageQueue *mq2 = _mgm.genMovement(&mgminfo);
+				MessageQueue *mq2 = _aniHandler.genMovement(&mgminfo);
 				mq->transferExCommands(mq2);
 
 				delete mq2;
@@ -2504,7 +2504,7 @@ MessageQueue *MovGraph2::genMovement(MovInfo1 *info) {
 	int a2 = 0;
 	int mgmLen;
 
-	_mgm.calcLength(&point, _items2[info->index]->_subItems[info->subIndex]._walk[1]._mov, x, y, &mgmLen, &a2, info->flags & 1);
+	_aniHandler.calcLength(&point, _items2[info->index]->_subItems[info->subIndex]._walk[1]._mov, x, y, &mgmLen, &a2, info->flags & 1);
 
 	int x1 = point.x;
 	int y1 = point.y;
@@ -2619,7 +2619,7 @@ MessageQueue *MovGraph2::genMovement(MovInfo1 *info) {
 		ex->_excFlags |= 2;
 		mq->addExCommandToEnd(ex);
 
-		ex = _mgm.buildExCommand2(
+		ex = _aniHandler.buildExCommand2(
 								  _items2[info->index]->_subItems[info->subIndex]._walk[0]._mov,
 								  _items2[info->index]->_objectId,
 								  x1,
@@ -2641,7 +2641,7 @@ MessageQueue *MovGraph2::genMovement(MovInfo1 *info) {
 		else
 			par = -1;
 
-		ex = _mgm.buildExCommand2(
+		ex = _aniHandler.buildExCommand2(
 								  _items2[info->index]->_subItems[info->subIndex]._walk[1]._mov,
 								  _items2[info->index]->_objectId,
 								  x1,
@@ -2655,7 +2655,7 @@ MessageQueue *MovGraph2::genMovement(MovInfo1 *info) {
 	}
 
 	if (!(info->flags & 4)) {
-		ex = _mgm.buildExCommand2(
+		ex = _aniHandler.buildExCommand2(
 								  _items2[info->index]->_subItems[info->subIndex]._walk[2]._mov,
 								  _items2[info->index]->_objectId,
 								  x1,
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index b67c9b1a57..96bde0d4b7 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -149,7 +149,7 @@ public:
 	int _ladder_field_20;
 	int _ladder_field_24;
 	Common::Array<MctlLadderMovement *> _ladmovements;
-	AniHandler _mgm;
+	AniHandler _aniHandler;
 
 public:
 	MctlLadder();
@@ -282,7 +282,7 @@ public:
 	int _field_44;
 	Common::Array<MovGraphItem *> _items;
 	MovArr *(*_callback1)(StaticANIObject *ani, Common::Array<MovItem *> *items, signed int counter);
-	AniHandler _mgm;
+	AniHandler _aniHandler;
 
 public:
 	MovGraph();
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 43b1bf7dcf..fd90b5f972 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -396,7 +396,7 @@ public:
 	StaticANIObject *scene11_boots;
 	StaticANIObject *scene11_dudeOnSwing;
 	PictureObject *scene11_hint;
-	AniHandler scene11_mgm;
+	AniHandler scene11_aniHandler;
 	bool scene11_arcadeIsOn;
 	bool scene11_scrollIsEnabled;
 	bool scene11_scrollIsMaximized;
@@ -612,7 +612,7 @@ public:
 	Common::Array<WalkingBearder *> scene29_bearders;
 	int scene29_manX;
 	int scene29_manY;
-	AniHandler scene29_mgm;
+	AniHandler scene29_aniHandler;
 
 	StaticANIObject *scene30_leg;
 	int scene30_liftFlag;
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index c32bfbb77f..4d7b337d43 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -395,10 +395,10 @@ void sceneHandler04_jumpOnLadder() {
 
 	g_fp->_aniMan->_flags |= 1;
 
-	AniHandler mgm;
+	AniHandler aniHandler;
 	MGMInfo mgminfo;
 
-	mgm.addItem(ANI_MAN);
+	aniHandler.addItem(ANI_MAN);
 
 	mgminfo.ani = g_fp->_aniMan;
 	mgminfo.staticsId2 = ST_MAN_ONPLANK;
@@ -409,7 +409,7 @@ void sceneHandler04_jumpOnLadder() {
 	mgminfo.flags = 78;
 	mgminfo.movementId = MV_MAN_JUMPONPLANK;
 
-	MessageQueue *mq = mgm.genMovement(&mgminfo);
+	MessageQueue *mq = aniHandler.genMovement(&mgminfo);
 
 	if (mq) {
 		mq->_flags |= 1;
@@ -460,10 +460,10 @@ void sceneHandler04_dropBottle() {
 }
 
 void sceneHandler04_gotoLadder(ExCommand *ex) {
-	AniHandler mgm;
+	AniHandler aniHandler;
 	MGMInfo mgminfo;
 
-	mgm.addItem(ANI_MAN);
+	aniHandler.addItem(ANI_MAN);
 
 	mgminfo.ani = g_fp->_aniMan;
 	mgminfo.staticsId2 = ST_MAN_UP;
@@ -474,7 +474,7 @@ void sceneHandler04_gotoLadder(ExCommand *ex) {
 	mgminfo.flags = 78;
 	mgminfo.movementId = MV_MAN_PLANKTOLADDER;
 
-	MessageQueue *mq = mgm.genMovement(&mgminfo);
+	MessageQueue *mq = aniHandler.genMovement(&mgminfo);
 
 	if (mq) {
 		mq->deleteExCommandByIndex(mq->getCount() - 1, 1);
@@ -550,10 +550,10 @@ void sceneHandler04_raisePlank() {
 }
 
 MessageQueue *sceneHandler04_kozFly3(StaticANIObject *ani, double phase) {
-	AniHandler mgm;
+	AniHandler aniHandler;
 	MGMInfo mgminfo;
 
-	mgm.addItem(ANI_KOZAWKA);
+	aniHandler.addItem(ANI_KOZAWKA);
 
 	mgminfo.ani = ani;
 	mgminfo.staticsId2 = ST_KZW_SIT;
@@ -564,7 +564,7 @@ MessageQueue *sceneHandler04_kozFly3(StaticANIObject *ani, double phase) {
 	mgminfo.flags = 78;
 	mgminfo.movementId = MV_KZW_JUMP;
 
-	MessageQueue *mq = mgm.genMovement(&mgminfo);
+	MessageQueue *mq = aniHandler.genMovement(&mgminfo);
 
 	if (mq) {
 		ExCommand *ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_STANDUP, 0, 0, 0, 1, 0, 0, 0);
@@ -599,10 +599,10 @@ MessageQueue *sceneHandler04_kozFly3(StaticANIObject *ani, double phase) {
 }
 
 MessageQueue *sceneHandler04_kozFly5(StaticANIObject *ani, double phase) {
-	AniHandler mgm;
+	AniHandler aniHandler;
 	MGMInfo mgminfo;
 
-	mgm.addItem(ANI_KOZAWKA);
+	aniHandler.addItem(ANI_KOZAWKA);
 
 	mgminfo.ani = ani;
 	mgminfo.staticsId2 = ST_KZW_JUMPOUT;
@@ -613,7 +613,7 @@ MessageQueue *sceneHandler04_kozFly5(StaticANIObject *ani, double phase) {
 	mgminfo.flags = 78;
 	mgminfo.movementId = MV_KZW_JUMPHIT;
 
-	MessageQueue *mq1 = mgm.genMovement(&mgminfo);
+	MessageQueue *mq1 = aniHandler.genMovement(&mgminfo);
 
 	memset(&mgminfo, 0, sizeof(mgminfo));
 	mgminfo.ani = ani;
@@ -627,7 +627,7 @@ MessageQueue *sceneHandler04_kozFly5(StaticANIObject *ani, double phase) {
 	mgminfo.flags = 117;
 	mgminfo.movementId = MV_KZW_JUMPOUT;
 
-	MessageQueue *mq2 = mgm.genMovement(&mgminfo);
+	MessageQueue *mq2 = aniHandler.genMovement(&mgminfo);
 
 	if (mq1 && mq2) {
 		mq1->addExCommandToEnd(mq2->getExCommandByIndex(0)->createClone());
@@ -670,10 +670,10 @@ MessageQueue *sceneHandler04_kozFly5(StaticANIObject *ani, double phase) {
 }
 
 MessageQueue *sceneHandler04_kozFly6(StaticANIObject *ani) {
-	AniHandler mgm;
+	AniHandler aniHandler;
 	MGMInfo mgminfo;
 
-	mgm.addItem(ANI_KOZAWKA);
+	aniHandler.addItem(ANI_KOZAWKA);
 
 	mgminfo.ani = ani;
 	mgminfo.staticsId2 = ST_KZW_SIT;
@@ -684,7 +684,7 @@ MessageQueue *sceneHandler04_kozFly6(StaticANIObject *ani) {
 	mgminfo.flags = 78;
 	mgminfo.movementId = MV_KZW_JUMPROTATE;
 
-	MessageQueue *mq = mgm.genMovement(&mgminfo);
+	MessageQueue *mq = aniHandler.genMovement(&mgminfo);
 
 	if (mq) {
 		mq->deleteExCommandByIndex(mq->getCount() - 1, 1);
@@ -728,10 +728,10 @@ void sceneHandler04_kozMove(Movement *mov, int from, int to, Common::Point *poin
 }
 
 MessageQueue *sceneHandler04_kozFly7(StaticANIObject *ani, double phase) {
-	AniHandler mgm;
+	AniHandler aniHandler;
 	MGMInfo mgminfo;
 
-	mgm.addItem(ANI_KOZAWKA);
+	aniHandler.addItem(ANI_KOZAWKA);
 
 	mgminfo.ani = ani;
 	mgminfo.staticsId2 = 560;
@@ -742,7 +742,7 @@ MessageQueue *sceneHandler04_kozFly7(StaticANIObject *ani, double phase) {
 	mgminfo.flags = 78;
 	mgminfo.movementId = MV_KZW_JUMPROTATE;
 
-	MessageQueue *mq = mgm.genMovement(&mgminfo);
+	MessageQueue *mq = aniHandler.genMovement(&mgminfo);
 
 	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 1fa5cabc15..e152286f48 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.clear();
 	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.addItem(g_fp->_aniMan->_id);
 
 	g_fp->_currentScene->_x = 1400 - g_fp->_sceneRect.right;
 
@@ -402,7 +402,7 @@ void sceneHandler11_jumpHitAndWin() {
 	mgminfo.flags = 66;
 	mgminfo.movementId = MV_MAN11_JUMPHIT;
 
-	MessageQueue *mq = g_vars->scene11_mgm.genMovement(&mgminfo);
+	MessageQueue *mq = g_vars->scene11_aniHandler.genMovement(&mgminfo);
 
 	if (mq) {
 		g_vars->scene11_crySound = SND_11_024;
@@ -447,7 +447,7 @@ void sceneHandler11_jumpOver(double angle) {
 	mgminfo.flags = 78;
 	mgminfo.movementId = MV_MAN11_JUMPOVER;
 
-	MessageQueue *mq = g_vars->scene11_mgm.genMovement(&mgminfo);
+	MessageQueue *mq = g_vars->scene11_aniHandler.genMovement(&mgminfo);
 
 	if (mq) {
 		g_vars->scene11_crySound = SND_11_022;
@@ -487,7 +487,7 @@ void sceneHandler11_jumpHit(double angle) {
 	mgminfo.flags = 78;
 	mgminfo.movementId = MV_MAN11_JUMPHIT;
 
-	MessageQueue *mq = g_vars->scene11_mgm.genMovement(&mgminfo);
+	MessageQueue *mq = g_vars->scene11_aniHandler.genMovement(&mgminfo);
 
 	if (mq) {
 		g_vars->scene11_crySound = SND_11_022;
diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index a03671a4d0..c68553c490 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -503,7 +503,7 @@ void sceneHandler29_manHit() {
 	mgminfo.flags = (g_vars->scene29_manX <= 638 ? 2 : 0) | 0x44;
 	mgminfo.movementId = MV_MAN29_HIT;
 
-	MessageQueue *mq = g_vars->scene29_mgm.genMovement(&mgminfo);
+	MessageQueue *mq = g_vars->scene29_aniHandler.genMovement(&mgminfo);
 	ExCommand *ex;
 
 	if (mq) {
@@ -728,7 +728,7 @@ void sceneHandler29_manToL() {
 
 	g_vars->scene29_arcadeIsOn = true;
 
-	g_vars->scene29_mgm.addItem(g_fp->_aniMan->_id);
+	g_vars->scene29_aniHandler.addItem(g_fp->_aniMan->_id);
 
 	g_fp->_updateScreenCallback = sceneHandler29_updateScreenCallback;
 
diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index 14245d5eaf..e02547795d 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -156,7 +156,7 @@ StaticANIObject::~StaticANIObject() {
 
 	_movements.clear();
 
-	g_fp->_mgm->clear();
+	g_fp->_aniHandler->clear();
 }
 
 StaticANIObject::StaticANIObject(StaticANIObject *src) : GameObject(src) {
@@ -1040,9 +1040,9 @@ void StaticANIObject::adjustSomeXY() {
 }
 
 MessageQueue *StaticANIObject::changeStatics1(int msgNum) {
-	g_fp->_mgm->addItem(_id);
+	g_fp->_aniHandler->addItem(_id);
 
-	MessageQueue *mq = g_fp->_mgm->genMQ(this, msgNum, 0, 0, 0);
+	MessageQueue *mq = g_fp->_aniHandler->genMQ(this, msgNum, 0, 0, 0);
 
 	if (!mq)
 		return 0;
@@ -1071,8 +1071,8 @@ void StaticANIObject::changeStatics2(int objId) {
 	deleteFromGlobalMessageQueue();
 
 	if (_movement || _statics) {
-		g_fp->_mgm->addItem(_id);
-		g_fp->_mgm->updateAnimStatics(this, objId);
+		g_fp->_aniHandler->addItem(_id);
+		g_fp->_aniHandler->updateAnimStatics(this, objId);
 	} else {
 		_statics = getStaticsById(objId);
 	}