diff options
Diffstat (limited to 'engines/fullpipe/scenes')
-rw-r--r-- | engines/fullpipe/scenes/scene04.cpp | 10 | ||||
-rw-r--r-- | engines/fullpipe/scenes/scene05.cpp | 8 | ||||
-rw-r--r-- | engines/fullpipe/scenes/scene06.cpp | 2 | ||||
-rw-r--r-- | engines/fullpipe/scenes/scene34.cpp | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp index 332935072c..b2137ec627 100644 --- a/engines/fullpipe/scenes/scene04.cpp +++ b/engines/fullpipe/scenes/scene04.cpp @@ -263,8 +263,8 @@ void sceneHandler04_clickButton() { StaticANIObject *but = g_fp->_currentScene->getStaticANIObject1ById(ANI_BUTTON, -1); if (but) { - if (!g_vars->scene04_clock->_movement || - (g_vars->scene04_clock->_movement->_id == MV_CLK_GO && g_vars->scene04_clock->_movement->_currDynamicPhaseIndex > 3 && + if (!g_vars->scene04_clock->_movement || + (g_vars->scene04_clock->_movement->_id == MV_CLK_GO && g_vars->scene04_clock->_movement->_currDynamicPhaseIndex > 3 && g_vars->scene04_clock->_movement->_currDynamicPhaseIndex < 105)) { if (!g_vars->scene04_hand->_movement && !g_vars->scene04_bottleIsTaken) { but->startAnim(MV_BTN_CLICK, 0, -1); @@ -1196,7 +1196,7 @@ void sceneHandler04_takeBottle() { void sceneHandler04_takeKozyawka() { if (g_vars->scene04_kozyawkiAni.size() > 0) { - if (g_vars->scene04_kozyawkiAni.size() == 1) + if (g_vars->scene04_kozyawkiAni.size() == 1) g_vars->scene04_objectIsTaken = true; StaticANIObject *koz = g_vars->scene04_kozyawkiAni.front(); @@ -1284,7 +1284,7 @@ int sceneHandler04(ExCommand *ex) { case MSG_UPDATEBOTTLE: sceneHandler04_updateBottle(); break; - + case MSG_CLICKBOTTLE: sceneHandler04_clickBottle(); break; @@ -1486,7 +1486,7 @@ int sceneHandler04(ExCommand *ex) { case MSG_SC4_DROPBOTTLE: sceneHandler04_dropBottle(); break; - + case MSG_SC4_COINOUT: g_vars->scene04_clock->changeStatics2(ST_CLK_CLOSED); g_vars->scene04_coinPut = false; diff --git a/engines/fullpipe/scenes/scene05.cpp b/engines/fullpipe/scenes/scene05.cpp index c6e21daf1e..1a728794aa 100644 --- a/engines/fullpipe/scenes/scene05.cpp +++ b/engines/fullpipe/scenes/scene05.cpp @@ -123,7 +123,7 @@ void sceneHandler05_makeWackoFeedback() { } void sceneHandler05_resetTicks() { - if (g_fp->_aniMan->_movement && (g_fp->_aniMan->_movement->_id == MV_MANHDL_HANDLEUP + if (g_fp->_aniMan->_movement && (g_fp->_aniMan->_movement->_id == MV_MANHDL_HANDLEUP || g_fp->_aniMan->_movement->_id == MV_MANHDL_HANDLEDOWN)) g_vars->scene05_wackoTicker = g_fp->_updateTicks; else @@ -312,7 +312,7 @@ int sceneHandler05(ExCommand *ex) { break; case MSG_SC5_MAKEOTMFEEDBACK: - if (!g_fp->_aniMan->_movement || (g_fp->_aniMan->_movement->_id != MV_MANHDL_HANDLEUP + if (!g_fp->_aniMan->_movement || (g_fp->_aniMan->_movement->_id != MV_MANHDL_HANDLEUP && g_fp->_aniMan->_movement->_id != MV_MANHDL_HANDLEDOWN)) { sceneHandler05_makeWackoFeedback(); g_vars->scene05_wackoTicker = 0; @@ -341,7 +341,7 @@ int sceneHandler05(ExCommand *ex) { sceneHandler05_testHatch(ex); break; - case 33: + case 33: { int res = 0; if (g_fp->_aniMan2) { @@ -356,7 +356,7 @@ int sceneHandler05(ExCommand *ex) { if (g_vars->scene05_wackoTicker) { if ((g_fp->_updateTicks - g_vars->scene05_wackoTicker) > 62) { - if (!g_fp->_aniMan->_movement || (g_fp->_aniMan->_movement->_id != MV_MANHDL_HANDLEUP + if (!g_fp->_aniMan->_movement || (g_fp->_aniMan->_movement->_id != MV_MANHDL_HANDLEUP && g_fp->_aniMan->_movement->_id != MV_MANHDL_HANDLEDOWN)) { if (g_vars->scene05_handleFlipper % 2) sceneHandler05_makeWackoFeedback(); diff --git a/engines/fullpipe/scenes/scene06.cpp b/engines/fullpipe/scenes/scene06.cpp index 83b98c2722..2687db70b7 100644 --- a/engines/fullpipe/scenes/scene06.cpp +++ b/engines/fullpipe/scenes/scene06.cpp @@ -671,7 +671,7 @@ int sceneHandler06(ExCommand *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) + && 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; diff --git a/engines/fullpipe/scenes/scene34.cpp b/engines/fullpipe/scenes/scene34.cpp index 0e690f4703..136dea59dd 100644 --- a/engines/fullpipe/scenes/scene34.cpp +++ b/engines/fullpipe/scenes/scene34.cpp @@ -216,7 +216,7 @@ void sceneHandler34_animateAction(ExCommand *cmd) { int qId = 0; if (ox == 887) { - if (oy != 370) + if (oy != 370) return; qId = QU_SC34_FROMSTOOL; |