diff options
Diffstat (limited to 'engines/fullpipe/scenes/scene06.cpp')
-rw-r--r-- | engines/fullpipe/scenes/scene06.cpp | 206 |
1 files changed, 103 insertions, 103 deletions
diff --git a/engines/fullpipe/scenes/scene06.cpp b/engines/fullpipe/scenes/scene06.cpp index 5bbd280fdd..2b7678b10a 100644 --- a/engines/fullpipe/scenes/scene06.cpp +++ b/engines/fullpipe/scenes/scene06.cpp @@ -38,53 +38,53 @@ namespace Fullpipe { void scene06_initMumsy() { - g_vars->scene06_mumsyJumpFw = g_fullpipe->_behaviorManager->getBehaviorEntryInfoByMessageQueueDataId(g_vars->scene06_mumsy, ST_MOM_STANDS, QU_MOM_JUMPFW); - g_vars->scene06_mumsyJumpBk = g_fullpipe->_behaviorManager->getBehaviorEntryInfoByMessageQueueDataId(g_vars->scene06_mumsy, ST_MOM_STANDS, QU_MOM_JUMPBK); + g_vars->scene06_mumsyJumpFw = g_fp->_behaviorManager->getBehaviorEntryInfoByMessageQueueDataId(g_vars->scene06_mumsy, ST_MOM_STANDS, QU_MOM_JUMPFW); + g_vars->scene06_mumsyJumpBk = g_fp->_behaviorManager->getBehaviorEntryInfoByMessageQueueDataId(g_vars->scene06_mumsy, ST_MOM_STANDS, QU_MOM_JUMPBK); g_vars->scene06_mumsyJumpFwPercent = g_vars->scene06_mumsyJumpFw->_percent; g_vars->scene06_mumsyJumpBkPercent = g_vars->scene06_mumsyJumpBk->_percent; } int scene06_updateCursor() { - g_fullpipe->updateCursorCommon(); + g_fp->updateCursorCommon(); if (g_vars->scene06_arcadeEnabled) { if (g_vars->scene06_aimingBall) { - g_fullpipe->_cursorId = PIC_CSR_ARCADE2_D; + g_fp->_cursorId = PIC_CSR_ARCADE2_D; return PIC_CSR_ARCADE2_D; } - if (g_fullpipe->_aniMan == (StaticANIObject *)g_fullpipe->_objectAtCursor) { - if (g_fullpipe->_aniMan->_statics->_staticsId == ST_MAN6_BALL && g_fullpipe->_cursorId == PIC_CSR_DEFAULT) { - g_fullpipe->_cursorId = PIC_CSR_ITN; + if (g_fp->_aniMan == (StaticANIObject *)g_fp->_objectAtCursor) { + if (g_fp->_aniMan->_statics->_staticsId == ST_MAN6_BALL && g_fp->_cursorId == PIC_CSR_DEFAULT) { + g_fp->_cursorId = PIC_CSR_ITN; return PIC_CSR_ITN; } - } else if (g_fullpipe->_objectAtCursor && (StaticANIObject *)g_fullpipe->_objectAtCursor == g_vars->scene06_currentBall - && g_fullpipe->_cursorId == PIC_CSR_DEFAULT) { - g_fullpipe->_cursorId = PIC_CSR_ITN; + } else if (g_fp->_objectAtCursor && (StaticANIObject *)g_fp->_objectAtCursor == g_vars->scene06_currentBall + && g_fp->_cursorId == PIC_CSR_DEFAULT) { + g_fp->_cursorId = PIC_CSR_ITN; } } - return g_fullpipe->_cursorId; + return g_fp->_cursorId; } void sceneHandler06_setExits(Scene *sc) { MotionController *mc = getSc2MctlCompoundBySceneId(sc->_sceneId); - mc->enableLinks(sO_CloseThing, (g_fullpipe->getObjectState(sO_BigMumsy) != g_fullpipe->getObjectEnumState(sO_BigMumsy, sO_IsGone))); + mc->enableLinks(sO_CloseThing, (g_fp->getObjectState(sO_BigMumsy) != g_fp->getObjectEnumState(sO_BigMumsy, sO_IsGone))); mc->enableLinks(sO_CloseThing2, g_vars->scene06_arcadeEnabled); } void sceneHandler06_winArcade() { - g_fullpipe->setObjectState(sO_BigMumsy, g_fullpipe->getObjectEnumState(sO_BigMumsy, sO_IsGone)); + g_fp->setObjectState(sO_BigMumsy, g_fp->getObjectEnumState(sO_BigMumsy, sO_IsGone)); - if (g_fullpipe->getObjectState(sO_ClockAxis) == g_fullpipe->getObjectEnumState(sO_ClockAxis, sO_IsNotAvailable)) - g_fullpipe->setObjectState(sO_ClockAxis, g_fullpipe->getObjectEnumState(sO_ClockAxis, sO_WithoutHandle)); + if (g_fp->getObjectState(sO_ClockAxis) == g_fp->getObjectEnumState(sO_ClockAxis, sO_IsNotAvailable)) + g_fp->setObjectState(sO_ClockAxis, g_fp->getObjectEnumState(sO_ClockAxis, sO_WithoutHandle)); if (g_vars->scene06_arcadeEnabled) { - g_fullpipe->_aniMan->_callback2 = 0; + g_fp->_aniMan->_callback2 = 0; - g_fullpipe->_aniMan->changeStatics2(ST_MAN_RIGHT | 0x4000); + g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT | 0x4000); if (g_vars->scene06_someBall) { g_vars->scene06_someBall->_flags &= 0xFFFB; @@ -116,7 +116,7 @@ void sceneHandler06_winArcade() { g_vars->scene06_mumsy->_flags &= 0xFFFB; - sceneHandler06_setExits(g_fullpipe->_currentScene); + sceneHandler06_setExits(g_fp->_currentScene); getCurrSceneSc2MotionController()->setEnabled(); getGameLoaderInteractionController()->enableFlag24(); @@ -126,7 +126,7 @@ void sceneHandler06_enableDrops() { chainQueue(QU_SC6_DROPS, 0); g_vars->scene06_mumsy->changeStatics2(ST_MOM_SITS); - g_fullpipe->setObjectState(sO_BigMumsy, g_fullpipe->getObjectEnumState(sO_BigMumsy, sO_IsPlaying)); + g_fp->setObjectState(sO_BigMumsy, g_fp->getObjectEnumState(sO_BigMumsy, sO_IsPlaying)); chainQueue(QU_MOM_STANDUP, 1); @@ -136,7 +136,7 @@ void sceneHandler06_enableDrops() { g_vars->scene06_mumsyNumBalls = 0; g_vars->scene06_mumsyGotBall = false; - sceneHandler06_setExits(g_fullpipe->_currentScene); + sceneHandler06_setExits(g_fp->_currentScene); } void sceneHandler06_mumsyBallTake() { @@ -160,7 +160,7 @@ void sceneHandler06_mumsyBallTake() { break; } - MessageQueue *mq = new MessageQueue(g_fullpipe->_globalMessageQueueList->compact()); + MessageQueue *mq = new MessageQueue(g_fp->_globalMessageQueueList->compact()); ExCommand *ex = new ExCommand(ANI_MAMASHA, 2, 50, 0, 0, 0, 1, 0, 0, 0); @@ -168,10 +168,10 @@ void sceneHandler06_mumsyBallTake() { mq->addExCommandToEnd(ex); if (g_vars->scene06_mumsyNumBalls >= 5) { - g_fullpipe->setObjectState(sO_BigMumsy, g_fullpipe->getObjectEnumState(sO_BigMumsy, sO_IsGone)); + g_fp->setObjectState(sO_BigMumsy, g_fp->getObjectEnumState(sO_BigMumsy, sO_IsGone)); - if (g_fullpipe->getObjectState(sO_ClockAxis) == g_fullpipe->getObjectEnumState(sO_ClockAxis, sO_IsNotAvailable)) - g_fullpipe->setObjectState(sO_ClockAxis, g_fullpipe->getObjectEnumState(sO_ClockAxis, sO_WithoutHandle)); + if (g_fp->getObjectState(sO_ClockAxis) == g_fp->getObjectEnumState(sO_ClockAxis, sO_IsNotAvailable)) + g_fp->setObjectState(sO_ClockAxis, g_fp->getObjectEnumState(sO_ClockAxis, sO_WithoutHandle)); ex = new ExCommand(ANI_MAMASHA, 1, momAni, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 2; @@ -228,29 +228,29 @@ void sceneHandler06_mumsyBallTake() { g_vars->scene06_mumsyNumBalls = 0; g_vars->scene06_arcadeEnabled = false; - g_fullpipe->_aniMan2 = 0; + g_fp->_aniMan2 = 0; } void sceneHandler06_spinHandle() { - int tummy = g_fullpipe->getObjectState(sO_TummyTrampie); - - if (tummy == g_fullpipe->getObjectEnumState(sO_TummyTrampie, sO_IsEating)) - g_fullpipe->setObjectState(sO_TummyTrampie, g_fullpipe->getObjectEnumState(sO_TummyTrampie, sO_IsSleeping)); - else if (tummy == g_fullpipe->getObjectEnumState(sO_TummyTrampie, sO_IsSleeping)) - g_fullpipe->setObjectState(sO_TummyTrampie, g_fullpipe->getObjectEnumState(sO_TummyTrampie, sO_IsDrinking)); - else if (tummy == g_fullpipe->getObjectEnumState(sO_TummyTrampie, sO_IsDrinking)) - g_fullpipe->setObjectState(sO_TummyTrampie, g_fullpipe->getObjectEnumState(sO_TummyTrampie, sO_IsScratchingBelly)); - else if (tummy == g_fullpipe->getObjectEnumState(sO_TummyTrampie, sO_IsScratchingBelly)) - g_fullpipe->setObjectState(sO_TummyTrampie, g_fullpipe->getObjectEnumState(sO_TummyTrampie, sO_IsEating)); + int tummy = g_fp->getObjectState(sO_TummyTrampie); + + if (tummy == g_fp->getObjectEnumState(sO_TummyTrampie, sO_IsEating)) + g_fp->setObjectState(sO_TummyTrampie, g_fp->getObjectEnumState(sO_TummyTrampie, sO_IsSleeping)); + else if (tummy == g_fp->getObjectEnumState(sO_TummyTrampie, sO_IsSleeping)) + g_fp->setObjectState(sO_TummyTrampie, g_fp->getObjectEnumState(sO_TummyTrampie, sO_IsDrinking)); + else if (tummy == g_fp->getObjectEnumState(sO_TummyTrampie, sO_IsDrinking)) + g_fp->setObjectState(sO_TummyTrampie, g_fp->getObjectEnumState(sO_TummyTrampie, sO_IsScratchingBelly)); + else if (tummy == g_fp->getObjectEnumState(sO_TummyTrampie, sO_IsScratchingBelly)) + g_fp->setObjectState(sO_TummyTrampie, g_fp->getObjectEnumState(sO_TummyTrampie, sO_IsEating)); } void sceneHandler06_uPipeClick() { if (getGameLoaderInteractionController()->_flag24) - handleObjectInteraction(g_fullpipe->_aniMan2, g_fullpipe->_currentScene->getPictureObjectById(PIC_SC6_LADDER, 0), 0); + handleObjectInteraction(g_fp->_aniMan2, g_fp->_currentScene->getPictureObjectById(PIC_SC6_LADDER, 0), 0); } void sceneHandler06_buttonPush() { - g_vars->scene06_invHandle = g_fullpipe->_currentScene->getStaticANIObject1ById(ANI_INV_HANDLE, -1); + g_vars->scene06_invHandle = g_fp->_currentScene->getStaticANIObject1ById(ANI_INV_HANDLE, -1); if (g_vars->scene06_invHandle) if (g_vars->scene06_invHandle->_flags & 4) @@ -264,7 +264,7 @@ void sceneHandler06_showNextBall() { g_vars->scene06_currentBall = new StaticANIObject(g_vars->scene06_balls.front()); g_vars->scene06_balls.remove_at(0); - MessageQueue *mq = new MessageQueue(g_fullpipe->_currentScene->getMessageQueueById(QU_SC6_SHOWNEXTBALL), 0, 1); + MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC6_SHOWNEXTBALL), 0, 1); mq->replaceKeyCode(-1, g_vars->scene06_currentBall->_okeyCode); mq->chain(0); @@ -280,10 +280,10 @@ void sceneHandler06_installHandle() { int sceneHandler06_updateScreenCallback() { int res; - res = g_fullpipe->drawArcadeOverlay(g_vars->scene06_arcadeEnabled); + res = g_fp->drawArcadeOverlay(g_vars->scene06_arcadeEnabled); if (!res) - g_fullpipe->_updateScreenCallback = 0; + g_fp->_updateScreenCallback = 0; return res; } @@ -292,13 +292,13 @@ void sceneHandler06_startAiming() { if (g_vars->scene06_currentBall) { g_vars->scene06_currentBall->hide(); - g_fullpipe->_aniMan->startAnim(MV_MAN6_TAKEBALL, 0, -1); + g_fp->_aniMan->startAnim(MV_MAN6_TAKEBALL, 0, -1); g_vars->scene06_ballInHands = g_vars->scene06_currentBall; g_vars->scene06_currentBall = 0; if (getCurrSceneSc2MotionController()->_isEnabled) - g_fullpipe->_updateScreenCallback = sceneHandler06_updateScreenCallback; + g_fp->_updateScreenCallback = sceneHandler06_updateScreenCallback; getCurrSceneSc2MotionController()->clearEnabled(); getGameLoaderInteractionController()->disableFlag24(); @@ -309,18 +309,18 @@ void sceneHandler06_startAiming() { void sceneHandler06_takeBall() { if (g_vars->scene06_currentBall && !g_vars->scene06_currentBall->_movement && g_vars->scene06_currentBall->_statics->_staticsId == ST_NBL_NORM) { - if (abs(1158 - g_fullpipe->_aniMan->_ox) > 1 - || abs(452 - g_fullpipe->_aniMan->_oy) > 1 - || g_fullpipe->_aniMan->_movement - || g_fullpipe->_aniMan->_statics->_staticsId != (0x4000 | ST_MAN_RIGHT)) { - MessageQueue *mq = getCurrSceneSc2MotionController()->method34(g_fullpipe->_aniMan, 1158, 452, 1, (0x4000 | ST_MAN_RIGHT)); + if (abs(1158 - g_fp->_aniMan->_ox) > 1 + || abs(452 - g_fp->_aniMan->_oy) > 1 + || g_fp->_aniMan->_movement + || g_fp->_aniMan->_statics->_staticsId != (0x4000 | ST_MAN_RIGHT)) { + MessageQueue *mq = getCurrSceneSc2MotionController()->method34(g_fp->_aniMan, 1158, 452, 1, (0x4000 | ST_MAN_RIGHT)); if (mq) { ExCommand *ex = new ExCommand(0, 17, MSG_SC6_TAKEBALL, 0, 0, 0, 1, 0, 0, 0); ex->_excFlags |= 3; mq->addExCommandToEnd(ex); - postExCommand(g_fullpipe->_aniMan->_id, 2, 1158, 452, 0, -1); + postExCommand(g_fp->_aniMan->_id, 2, 1158, 452, 0, -1); } } else { sceneHandler06_startAiming(); @@ -330,18 +330,18 @@ void sceneHandler06_takeBall() { void sceneHandler06_aiming() { if (g_vars->scene06_ballInHands) { - g_vars->scene06_ballDeltaX = 4 * g_fullpipe->_aniMan->_movement->_currDynamicPhaseIndex + 16; - g_vars->scene06_ballDeltaY = 5 * (g_fullpipe->_aniMan->_movement->_currDynamicPhaseIndex + 4); + g_vars->scene06_ballDeltaX = 4 * g_fp->_aniMan->_movement->_currDynamicPhaseIndex + 16; + g_vars->scene06_ballDeltaY = 5 * (g_fp->_aniMan->_movement->_currDynamicPhaseIndex + 4); - if (g_fullpipe->_aniMan->_movement->_currDynamicPhaseIndex < 4) { - g_fullpipe->_aniMan->_movement->setDynamicPhaseIndex(11); + if (g_fp->_aniMan->_movement->_currDynamicPhaseIndex < 4) { + g_fp->_aniMan->_movement->setDynamicPhaseIndex(11); g_vars->scene06_aimingBall = false; return; } - g_fullpipe->_aniMan->_movement->setDynamicPhaseIndex(9); + g_fp->_aniMan->_movement->setDynamicPhaseIndex(9); } g_vars->scene06_aimingBall = false; @@ -351,7 +351,7 @@ void sceneHandler06_ballStartFly() { if (g_vars->scene06_ballInHands) { g_vars->scene06_flyingBall = g_vars->scene06_ballInHands; g_vars->scene06_ballInHands = 0; - g_vars->scene06_flyingBall->show1(g_fullpipe->_aniMan->_ox - 60, g_fullpipe->_aniMan->_oy - 60, -1, 0); + g_vars->scene06_flyingBall->show1(g_fp->_aniMan->_ox - 60, g_fp->_aniMan->_oy - 60, -1, 0); g_vars->scene06_flyingBall->_priority = 27; } @@ -359,10 +359,10 @@ void sceneHandler06_ballStartFly() { void sceneHandler06_throwCallback(int *arg) { if (g_vars->scene06_aimingBall) { - int dist = (g_fullpipe->_mouseVirtY - g_vars->scene06_sceneClickY) - * (g_fullpipe->_mouseVirtY - g_vars->scene06_sceneClickY) - + (g_fullpipe->_mouseVirtX - g_vars->scene06_sceneClickX) - * (g_fullpipe->_mouseVirtX - g_vars->scene06_sceneClickX); + int dist = (g_fp->_mouseVirtY - g_vars->scene06_sceneClickY) + * (g_fp->_mouseVirtY - g_vars->scene06_sceneClickY) + + (g_fp->_mouseVirtX - g_vars->scene06_sceneClickX) + * (g_fp->_mouseVirtX - g_vars->scene06_sceneClickX); *arg = (int)(sqrt((double)dist) * 0.1); @@ -376,15 +376,15 @@ void sceneHandler06_throwCallback(int *arg) { } void sceneHandler06_throwBall() { - g_fullpipe->_aniMan->_callback2 = sceneHandler06_throwCallback; - g_fullpipe->_aniMan->startAnim(MV_MAN6_THROWBALL, 0, -1); + g_fp->_aniMan->_callback2 = sceneHandler06_throwCallback; + g_fp->_aniMan->startAnim(MV_MAN6_THROWBALL, 0, -1); g_vars->scene06_aimingBall = true; } void sceneHandler06_eggieWalk() { - if (15 - g_vars->scene06_numBallsGiven >= 4 && !g_fullpipe->_rnd->getRandomNumber(9)) { - StaticANIObject *ani = g_fullpipe->_currentScene->getStaticANIObject1ById(ANI_EGGIE, -1); + if (15 - g_vars->scene06_numBallsGiven >= 4 && !g_fp->_rnd->getRandomNumber(9)) { + StaticANIObject *ani = g_fp->_currentScene->getStaticANIObject1ById(ANI_EGGIE, -1); if (!ani || !(ani->_flags & 4)) { if (g_vars->scene06_eggieDirection) @@ -410,7 +410,7 @@ void sceneHandler06_fallBall() { g_vars->scene06_flyingBall->setOXY(g_vars->scene06_ballX, g_vars->scene06_ballY); - MessageQueue *mq = new MessageQueue(g_fullpipe->_currentScene->getMessageQueueById(QU_SC6_FALLBALL), 0, 1); + MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC6_FALLBALL), 0, 1); mq->replaceKeyCode(-1, g_vars->scene06_flyingBall->_okeyCode); mq->chain(0); @@ -524,19 +524,19 @@ void scene06_initScene(Scene *sc) { g_vars->scene06_balls.push_back(ball2); } - if (g_fullpipe->getObjectState(sO_BigMumsy) == g_fullpipe->getObjectEnumState(sO_BigMumsy, sO_IsPlaying)) - g_fullpipe->setObjectState(sO_BigMumsy, g_fullpipe->getObjectEnumState(sO_BigMumsy, sO_IsSleeping)); + if (g_fp->getObjectState(sO_BigMumsy) == g_fp->getObjectEnumState(sO_BigMumsy, sO_IsPlaying)) + g_fp->setObjectState(sO_BigMumsy, g_fp->getObjectEnumState(sO_BigMumsy, sO_IsSleeping)); - if (g_fullpipe->getObjectState(sO_BigMumsy) != g_fullpipe->getObjectEnumState(sO_BigMumsy, sO_IsSleeping)) + if (g_fp->getObjectState(sO_BigMumsy) != g_fp->getObjectEnumState(sO_BigMumsy, sO_IsSleeping)) g_vars->scene06_mumsy->hide(); - g_fullpipe->lift_setButton(sO_Level3, ST_LBN_3N); - g_fullpipe->lift_sub5(sc, QU_SC6_ENTERLIFT, QU_SC6_EXITLIFT); - g_fullpipe->initArcadeKeys("SC_6"); + g_fp->lift_setButton(sO_Level3, ST_LBN_3N); + g_fp->lift_sub5(sc, QU_SC6_ENTERLIFT, QU_SC6_EXITLIFT); + g_fp->initArcadeKeys("SC_6"); sceneHandler06_setExits(sc); - g_fullpipe->setArcadeOverlay(PIC_CSR_ARCADE2); + g_fp->setArcadeOverlay(PIC_CSR_ARCADE2); } int sceneHandler06(ExCommand *ex) { @@ -545,11 +545,11 @@ int sceneHandler06(ExCommand *ex) { switch(ex->_messageNum) { case MSG_LIFT_CLOSEDOOR: - g_fullpipe->lift_closedoorSeq(); + g_fp->lift_closedoorSeq(); break; case MSG_LIFT_EXITLIFT: - g_fullpipe->lift_exitSeq(ex); + g_fp->lift_exitSeq(ex); break; case MSG_CMN_WINARCADE: @@ -557,18 +557,18 @@ int sceneHandler06(ExCommand *ex) { break; case MSG_LIFT_STARTEXITQUEUE: - g_fullpipe->lift_startExitQueue(); + g_fp->lift_startExitQueue(); break; case MSG_SC6_RESTORESCROLL: - g_fullpipe->_aniMan2 = g_fullpipe->_aniMan; + g_fp->_aniMan2 = g_fp->_aniMan; getCurrSceneSc2MotionController()->setEnabled(); getGameLoaderInteractionController()->enableFlag24(); - sceneHandler06_setExits(g_fullpipe->_currentScene); + sceneHandler06_setExits(g_fp->_currentScene); break; case MSG_SC6_STARTDROPS: - if (g_fullpipe->getObjectState(sO_BigMumsy) == g_fullpipe->getObjectEnumState(sO_BigMumsy, sO_IsSleeping)) + if (g_fp->getObjectState(sO_BigMumsy) == g_fp->getObjectEnumState(sO_BigMumsy, sO_IsSleeping)) sceneHandler06_enableDrops(); break; @@ -590,7 +590,7 @@ int sceneHandler06(ExCommand *ex) { break; case MSG_LIFT_CLICKBUTTON: - g_fullpipe->lift_animation3(); + g_fp->lift_animation3(); break; case MSG_SPINHANDLE: @@ -598,7 +598,7 @@ int sceneHandler06(ExCommand *ex) { break; case MSG_LIFT_GO: - g_fullpipe->lift_goAnimation(); + g_fp->lift_goAnimation(); break; case MSG_SC6_UTRUBACLICK: @@ -622,7 +622,7 @@ int sceneHandler06(ExCommand *ex) { break; case 64: - g_fullpipe->lift_sub05(ex); + g_fp->lift_sub05(ex); break; case MSG_SC6_TAKEBALL: @@ -643,11 +643,11 @@ int sceneHandler06(ExCommand *ex) { case 29: { - StaticANIObject *st = g_fullpipe->_currentScene->getStaticANIObjectAtPos(ex->_sceneClickX, ex->_sceneClickY); + StaticANIObject *st = g_fp->_currentScene->getStaticANIObjectAtPos(ex->_sceneClickX, ex->_sceneClickY); if (st) { if (!g_vars->scene06_arcadeEnabled && st->_id == ANI_LIFTBUTTON) { - g_fullpipe->lift_sub1(st); + g_fp->lift_sub1(st); ex->_messageKind = 0; return 0; } @@ -657,7 +657,7 @@ int sceneHandler06(ExCommand *ex) { sceneHandler06_takeBall(); ex->_messageKind = 0; - } else if (g_vars->scene06_ballInHands && g_fullpipe->_aniMan == st && !g_fullpipe->_aniMan->_movement && g_fullpipe->_aniMan->_statics->_staticsId == ST_MAN6_BALL) { + } else if (g_vars->scene06_ballInHands && g_fp->_aniMan == st && !g_fp->_aniMan->_movement && g_fp->_aniMan->_statics->_staticsId == ST_MAN6_BALL) { g_vars->scene06_sceneClickX = ex->_sceneClickX; g_vars->scene06_sceneClickY = ex->_sceneClickY; @@ -665,15 +665,15 @@ int sceneHandler06(ExCommand *ex) { } } - if (!st || !canInteractAny(g_fullpipe->_aniMan, st, ex->_keyCode)) { - int picId = g_fullpipe->_currentScene->getPictureObjectIdAtPos(ex->_sceneClickX, ex->_sceneClickY); - PictureObject *pic = g_fullpipe->_currentScene->getPictureObjectById(picId, 0); + if (!st || !canInteractAny(g_fp->_aniMan, st, ex->_keyCode)) { + int picId = g_fp->_currentScene->getPictureObjectIdAtPos(ex->_sceneClickX, ex->_sceneClickY); + PictureObject *pic = g_fp->_currentScene->getPictureObjectById(picId, 0); - if (!pic || !canInteractAny(g_fullpipe->_aniMan, pic, ex->_keyCode)) { - if ((g_fullpipe->_sceneRect.right - ex->_sceneClickX < 47 - && g_fullpipe->_sceneRect.right < g_fullpipe->_sceneWidth - 1) - || (ex->_sceneClickX - g_fullpipe->_sceneRect.left < 47 && g_fullpipe->_sceneRect.left > 0)) { - g_fullpipe->processArcade(ex); + if (!pic || !canInteractAny(g_fp->_aniMan, pic, ex->_keyCode)) { + if ((g_fp->_sceneRect.right - ex->_sceneClickX < 47 + && g_fp->_sceneRect.right < g_fp->_sceneWidth - 1) + || (ex->_sceneClickX - g_fp->_sceneRect.left < 47 && g_fp->_sceneRect.left > 0)) { + g_fp->processArcade(ex); return 0; } } @@ -686,29 +686,29 @@ int sceneHandler06(ExCommand *ex) { { int res = 0; - if (g_fullpipe->_aniMan2) { - int ox = g_fullpipe->_aniMan2->_ox; - int oy = g_fullpipe->_aniMan2->_oy; + if (g_fp->_aniMan2) { + int ox = g_fp->_aniMan2->_ox; + int oy = g_fp->_aniMan2->_oy; g_vars->scene06_manX = ox; g_vars->scene06_manY = oy; if (g_vars->scene06_arcadeEnabled && oy <= 470 && ox >= 1088) { - if (ox < g_fullpipe->_sceneRect.left + 600) { - g_fullpipe->_currentScene->_x = ox - g_fullpipe->_sceneRect.left - 700; + if (ox < g_fp->_sceneRect.left + 600) { + g_fp->_currentScene->_x = ox - g_fp->_sceneRect.left - 700; ox = g_vars->scene06_manX; } - if (ox > g_fullpipe->_sceneRect.right - 50) - g_fullpipe->_currentScene->_x = ox - g_fullpipe->_sceneRect.right + 70; + if (ox > g_fp->_sceneRect.right - 50) + g_fp->_currentScene->_x = ox - g_fp->_sceneRect.right + 70; } else { - if (ox < g_fullpipe->_sceneRect.left + 200) { - g_fullpipe->_currentScene->_x = ox - g_fullpipe->_sceneRect.left - 300; + if (ox < g_fp->_sceneRect.left + 200) { + g_fp->_currentScene->_x = ox - g_fp->_sceneRect.left - 300; ox = g_vars->scene06_manX; } - if (ox > g_fullpipe->_sceneRect.right - 200) - g_fullpipe->_currentScene->_x = ox - g_fullpipe->_sceneRect.right + 300; + if (ox > g_fp->_sceneRect.right - 200) + g_fp->_currentScene->_x = ox - g_fp->_sceneRect.right + 300; } res = 1; @@ -757,8 +757,8 @@ int sceneHandler06(ExCommand *ex) { && !g_vars->scene06_mumsy->_movement && !g_vars->scene06_mumsyGotBall) sceneHandler06_mumsyBallTake(); - g_fullpipe->_behaviorManager->updateBehaviors(); - g_fullpipe->startSceneTrack(); + g_fp->_behaviorManager->updateBehaviors(); + g_fp->startSceneTrack(); return res; } |