aboutsummaryrefslogtreecommitdiff
path: root/engines/fullpipe/scenes
diff options
context:
space:
mode:
Diffstat (limited to 'engines/fullpipe/scenes')
-rw-r--r--engines/fullpipe/scenes/scene04.cpp38
-rw-r--r--engines/fullpipe/scenes/scene11.cpp10
-rw-r--r--engines/fullpipe/scenes/scene29.cpp4
3 files changed, 26 insertions, 26 deletions
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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-12 13:45:48 +0000