diff options
38 files changed, 242 insertions, 113 deletions
diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp index 3fdb6636ec..615f1e039b 100644 --- a/engines/fullpipe/modal.cpp +++ b/engines/fullpipe/modal.cpp @@ -867,6 +867,8 @@ PictureObject *ModalMap::getScenePicture(int sceneId) { case SC_FINAL1: picId = PIC_MAP_S38; break; + default: + break; } if (picId) @@ -998,6 +1000,10 @@ bool ModalMap::checkScenePass(PreloadItem *item) { if (g_fp->getObjectState(sO_Board_25) != g_fp->getObjectEnumState(sO_Board_25, sO_NearDudesStairs)) { res = false; } + break; + + default: + break; } switch (item->sceneId) { @@ -1027,6 +1033,9 @@ bool ModalMap::checkScenePass(PreloadItem *item) { } item->param = TrubaUp; break; + + default: + break; } if ((item->sceneId != SC_37 && item->preloadId1 != SC_37) diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp index 67acaedffe..70a1e2c5e6 100644 --- a/engines/fullpipe/motion.cpp +++ b/engines/fullpipe/motion.cpp @@ -1734,6 +1734,8 @@ bool MctlGraph::fillData(StaticANIObject *obj, MctlAni &item) { case 3: varD = var->getSubVarByName("Down"); break; + default: + break; } if (!varD) @@ -1752,6 +1754,8 @@ bool MctlGraph::fillData(StaticANIObject *obj, MctlAni &item) { case 2: idx = varD->getSubVarAsInt("Stop"); break; + default: + break; } item._subItems[dir]._walk[act]._movementId = idx; @@ -1782,6 +1786,8 @@ bool MctlGraph::fillData(StaticANIObject *obj, MctlAni &item) { case 3: idx = varD->getSubVarAsInt("TurnD"); break; + default: + break; } item._subItems[dir]._turn[act]._movementId = idx; @@ -1812,6 +1818,8 @@ bool MctlGraph::fillData(StaticANIObject *obj, MctlAni &item) { case 3: idx = varD->getSubVarAsInt("TurnSD"); break; + default: + break; } item._subItems[dir]._turnS[act]._movementId = idx; diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index f4f9308ff2..bbadf12794 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -1455,8 +1455,14 @@ void FullpipeEngine::updateMap(PreloadItem *pre) { case SC_19: updateMapPiece(PIC_MAP_P12, 1); break; + + default: + break; } break; + + default: + break; } } diff --git a/engines/fullpipe/scenes/scene02.cpp b/engines/fullpipe/scenes/scene02.cpp index c503013190..b552599b95 100644 --- a/engines/fullpipe/scenes/scene02.cpp +++ b/engines/fullpipe/scenes/scene02.cpp @@ -84,19 +84,19 @@ int sceneHandler02(ExCommand *ex) { switch(ex->_messageNum) { case MSG_SC2_LADDERCLICK: sceneHandler02_ladderClick(); - return 0; + break; case MSG_SC2_SHOWLADDER: sceneHandler02_showLadder(); - return 0; + break; case MSG_SC2_PUTMANUP: g_fp->_aniMan2->_priority = 0; - return 0; + break; case MSG_SC2_HIDELADDER: sceneHandler02_hideLadder(); - return 0; + break; case 33: if (g_fp->_aniMan2) { @@ -130,6 +130,10 @@ int sceneHandler02(ExCommand *ex) { g_fp->_behaviorManager->updateBehaviors(); g_fp->startSceneTrack(); + break; + + default: + break; } return res; diff --git a/engines/fullpipe/scenes/scene03.cpp b/engines/fullpipe/scenes/scene03.cpp index 1882ecf459..fea2579148 100644 --- a/engines/fullpipe/scenes/scene03.cpp +++ b/engines/fullpipe/scenes/scene03.cpp @@ -298,9 +298,8 @@ int sceneHandler03(ExCommand *ex) { return 0; } } - - break; } + break; case 33: { @@ -322,6 +321,10 @@ int sceneHandler03(ExCommand *ex) { return res; } + break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp index 59adf37c66..6585001269 100644 --- a/engines/fullpipe/scenes/scene04.cpp +++ b/engines/fullpipe/scenes/scene04.cpp @@ -1083,8 +1083,8 @@ void sceneHandler04_startSounds(const char *snd1, const char *snd2, const char * void updateSound() { switch (g_vars->scene04_musicStage) { case 0: - return; - + default: + break; case 1: if (!g_fp->_mixer->isSoundHandleActive(g_fp->_soundStream2)) { g_fp->playOggSound("sc4_loop.ogg", g_fp->_soundStream3); @@ -1506,6 +1506,7 @@ int sceneHandler04(ExCommand *ex) { return res; } + break; case 29: { @@ -1552,7 +1553,6 @@ int sceneHandler04(ExCommand *ex) { } } } - break; case MSG_SC4_HIDEBOOT: @@ -1585,7 +1585,6 @@ int sceneHandler04(ExCommand *ex) { sceneHandler04_handTake(); } - break; case MSG_SC4_KOZAWFALL: @@ -1605,8 +1604,8 @@ int sceneHandler04(ExCommand *ex) { exnew->_z = 5; exnew->_excFlags |= 2; exnew->postMessage(); - break; } + break; case MSG_SC4_MANFROMBOTTLE: sceneHandler04_manFromBottle(); @@ -1635,6 +1634,9 @@ int sceneHandler04(ExCommand *ex) { case MSG_SC4_COINPUT: g_vars->scene04_coinPut = true; break; + + default: + break; } updateSound(); diff --git a/engines/fullpipe/scenes/scene05.cpp b/engines/fullpipe/scenes/scene05.cpp index e67e12ac3d..8fb2f8ff93 100644 --- a/engines/fullpipe/scenes/scene05.cpp +++ b/engines/fullpipe/scenes/scene05.cpp @@ -398,6 +398,10 @@ int sceneHandler05(ExCommand *ex) { return res; } + break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene06.cpp b/engines/fullpipe/scenes/scene06.cpp index 54b3fb7ed5..83b50dd0fb 100644 --- a/engines/fullpipe/scenes/scene06.cpp +++ b/engines/fullpipe/scenes/scene06.cpp @@ -158,6 +158,8 @@ void sceneHandler06_mumsyBallTake() { case 5: momAni = MV_MOM_TAKE5; break; + default: + break; } MessageQueue *mq = new MessageQueue(g_fp->_globalMessageQueueList->compact()); @@ -674,7 +676,6 @@ int sceneHandler06(ExCommand *ex) { } } } - break; case 33: @@ -759,6 +760,10 @@ int sceneHandler06(ExCommand *ex) { return res; } + break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene07.cpp b/engines/fullpipe/scenes/scene07.cpp index 14ee5f1daa..4ad4998c44 100644 --- a/engines/fullpipe/scenes/scene07.cpp +++ b/engines/fullpipe/scenes/scene07.cpp @@ -126,11 +126,11 @@ int sceneHandler07(ExCommand *ex) { break; case MSG_SC7_PULL: - if (g_vars->scene07_plusMinus->_statics->_staticsId == ST_PMS_MINUS) + if (g_vars->scene07_plusMinus->_statics->_staticsId == ST_PMS_MINUS) { g_vars->scene07_plusMinus->_statics = g_vars->scene07_plusMinus->getStaticsById(ST_PMS_PLUS); - else + } else { g_vars->scene07_plusMinus->_statics = g_vars->scene07_plusMinus->getStaticsById(ST_PMS_MINUS); - + } break; case MSG_SC7_CLOSELUKE: @@ -167,6 +167,10 @@ int sceneHandler07(ExCommand *ex) { return res; } + break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene08.cpp b/engines/fullpipe/scenes/scene08.cpp index 00f8f93354..12170f04fe 100644 --- a/engines/fullpipe/scenes/scene08.cpp +++ b/engines/fullpipe/scenes/scene08.cpp @@ -550,6 +550,9 @@ int sceneHandler08(ExCommand *cmd) { return res; } + break; + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene09.cpp b/engines/fullpipe/scenes/scene09.cpp index 17dfc4a990..1761f5d5a3 100644 --- a/engines/fullpipe/scenes/scene09.cpp +++ b/engines/fullpipe/scenes/scene09.cpp @@ -505,6 +505,7 @@ int sceneHandler09(ExCommand *cmd) { return res; } + break; case 30: if (g_vars->scene09_interactingHanger >= 0) { @@ -578,9 +579,11 @@ int sceneHandler09(ExCommand *cmd) { g_fp->processArcade(cmd); } } - - break; } + break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene10.cpp b/engines/fullpipe/scenes/scene10.cpp index 990a8f2525..60f1a4eed0 100644 --- a/engines/fullpipe/scenes/scene10.cpp +++ b/engines/fullpipe/scenes/scene10.cpp @@ -212,6 +212,10 @@ int sceneHandler10(ExCommand *ex) { return res; } + break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene11.cpp b/engines/fullpipe/scenes/scene11.cpp index 7fb158b817..eed42b65ed 100644 --- a/engines/fullpipe/scenes/scene11.cpp +++ b/engines/fullpipe/scenes/scene11.cpp @@ -631,8 +631,9 @@ int sceneHandler11(ExCommand *cmd) { break; case 107: - if (g_vars->scene11_arcadeIsOn) + if (g_vars->scene11_arcadeIsOn) { sceneHandler11_swingLogic(); + } break; case 33: @@ -729,6 +730,7 @@ int sceneHandler11(ExCommand *cmd) { g_fp->startSceneTrack(); return res; } + break; case 29: if (g_vars->scene11_swingIsSwinging) { @@ -757,12 +759,16 @@ int sceneHandler11(ExCommand *cmd) { || (cmd->_sceneClickX - g_fp->_sceneRect.left < 47 && g_fp->_sceneRect.left > 0)) { g_fp->processArcade(cmd); - return 0; + break; } } } - return 0; + break; } + break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene13.cpp b/engines/fullpipe/scenes/scene13.cpp index 7b38442603..2eac5cbea4 100644 --- a/engines/fullpipe/scenes/scene13.cpp +++ b/engines/fullpipe/scenes/scene13.cpp @@ -128,6 +128,9 @@ void sceneHandler13_testOpen() { chainQueue(QU_SC13_OPENSUCCESS, 1); break; + + default: + break; } } @@ -329,8 +332,8 @@ int sceneHandler13(ExCommand *cmd) { } } } - break; } + break; case 33: { @@ -378,6 +381,10 @@ int sceneHandler13(ExCommand *cmd) { return res; } + break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp index d5070bb17b..161a6ba637 100644 --- a/engines/fullpipe/scenes/scene14.cpp +++ b/engines/fullpipe/scenes/scene14.cpp @@ -729,10 +729,9 @@ int sceneHandler14(ExCommand *cmd) { break; case MSG_SC14_HIDEPINK: - if (!g_vars->scene14_pink) - break; - - g_vars->scene14_pink->hide(); + if (g_vars->scene14_pink) { + g_vars->scene14_pink->hide(); + } break; case MSG_SC14_GMATOTRUBA: @@ -797,8 +796,8 @@ int sceneHandler14(ExCommand *cmd) { g_fp->_behaviorManager->updateBehaviors(); g_fp->startSceneTrack(); - break; } + break; case 30: if (g_vars->scene14_dudeIsKicking) { @@ -842,6 +841,9 @@ int sceneHandler14(ExCommand *cmd) { } } break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene15.cpp b/engines/fullpipe/scenes/scene15.cpp index cb4ae39806..01ccb70b03 100644 --- a/engines/fullpipe/scenes/scene15.cpp +++ b/engines/fullpipe/scenes/scene15.cpp @@ -128,11 +128,11 @@ int sceneHandler15(ExCommand *cmd) { break; case MSG_SC15_ASSDRYG: - if (g_fp->_rnd.getRandomNumber(1)) + if (g_fp->_rnd.getRandomNumber(1)) { g_fp->playSound(SND_15_011, 0); - else + } else { g_fp->playSound(SND_15_006, 0); - + } break; case MSG_SC15_LADDERTOBACK: @@ -148,11 +148,11 @@ int sceneHandler15(ExCommand *cmd) { break; case MSG_SC15_PULL: - if (g_vars->scene15_plusminus->_statics->_staticsId == ST_PMS_MINUS) + if (g_vars->scene15_plusminus->_statics->_staticsId == ST_PMS_MINUS) { g_vars->scene15_plusminus->_statics = g_vars->scene15_plusminus->getStaticsById(ST_PMS_PLUS); - else + } else { g_vars->scene15_plusminus->_statics = g_vars->scene15_plusminus->getStaticsById(ST_PMS_MINUS); - + } break; case 64: @@ -175,8 +175,8 @@ int sceneHandler15(ExCommand *cmd) { cmd->_messageKind = 0; } - break; } + break; case 30: // nop @@ -201,6 +201,10 @@ int sceneHandler15(ExCommand *cmd) { } g_fp->_behaviorManager->updateBehaviors(); + break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene16.cpp b/engines/fullpipe/scenes/scene16.cpp index 2441d4ec50..973fce9d29 100644 --- a/engines/fullpipe/scenes/scene16.cpp +++ b/engines/fullpipe/scenes/scene16.cpp @@ -125,6 +125,7 @@ void sceneHandler16_laughSound() { switch (g_vars->scene16_sound) { case SND_16_034: + default: snd = SND_16_035; break; @@ -415,11 +416,11 @@ int sceneHandler16(ExCommand *cmd) { break; case MSG_SC16_MUGCLICK: - if (!g_fp->_aniMan->isIdle() || g_fp->_aniMan->_flags & 0x100) + if (!g_fp->_aniMan->isIdle() || g_fp->_aniMan->_flags & 0x100) { cmd->_messageKind = 0; - else + } else { sceneHandler16_mugClick(); - + } break; case MSG_SC16_SHOWMAN: @@ -476,6 +477,10 @@ int sceneHandler16(ExCommand *cmd) { g_fp->_behaviorManager->updateBehaviors(); g_fp->startSceneTrack(); + break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene17.cpp b/engines/fullpipe/scenes/scene17.cpp index 7dd75ae5a2..e71c7c90d6 100644 --- a/engines/fullpipe/scenes/scene17.cpp +++ b/engines/fullpipe/scenes/scene17.cpp @@ -274,9 +274,11 @@ int sceneHandler17(ExCommand *cmd) { g_fp->_behaviorManager->updateBehaviors(); g_fp->startSceneTrack(); - - break; } + break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp index 93a2a7f006..35d3e025ec 100644 --- a/engines/fullpipe/scenes/scene18and19.cpp +++ b/engines/fullpipe/scenes/scene18and19.cpp @@ -729,7 +729,6 @@ int sceneHandler18(ExCommand *cmd) { { if (g_vars->scene18_enteredTrubaRight) { cmd->_messageKind = 0; - break; } @@ -760,8 +759,8 @@ int sceneHandler18(ExCommand *cmd) { } } } - break; } + break; case 33: if (g_fp->_aniMan2) { @@ -800,6 +799,9 @@ int sceneHandler18(ExCommand *cmd) { g_fp->_behaviorManager->updateBehaviors(); break; + + default: + break; } return 0; @@ -876,17 +878,16 @@ int sceneHandler19(ExCommand *cmd) { cmd->_messageKind = 0; break; } - break; - } - - if (g_vars->scene19_enteredTruba3) { - if (g_fp->_currentScene->getPictureObjectIdAtPos(cmd->_sceneClickX, cmd->_sceneClickY) == PIC_SC19_RTRUBA3) { - if (g_fp->_aniMan->isIdle()) { - if (!(g_fp->_aniMan->_flags & 0x100)) { - PictureObject *pic = g_fp->_currentScene->getPictureObjectById(PIC_SC19_RTRUBA31, 0); - - handleObjectInteraction(g_fp->_aniMan, pic, cmd->_param); - break; + } else { + if (g_vars->scene19_enteredTruba3) { + if (g_fp->_currentScene->getPictureObjectIdAtPos(cmd->_sceneClickX, cmd->_sceneClickY) == PIC_SC19_RTRUBA3) { + if (g_fp->_aniMan->isIdle()) { + if (!(g_fp->_aniMan->_flags & 0x100)) { + PictureObject *pic = g_fp->_currentScene->getPictureObjectById(PIC_SC19_RTRUBA31, 0); + + handleObjectInteraction(g_fp->_aniMan, pic, cmd->_param); + break; + } } } } @@ -926,6 +927,9 @@ int sceneHandler19(ExCommand *cmd) { g_fp->_behaviorManager->updateBehaviors(); break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene20.cpp b/engines/fullpipe/scenes/scene20.cpp index 53c019b5e1..009d0d3de7 100644 --- a/engines/fullpipe/scenes/scene20.cpp +++ b/engines/fullpipe/scenes/scene20.cpp @@ -147,6 +147,9 @@ int sceneHandler20(ExCommand *cmd) { g_fp->startSceneTrack(); break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene21.cpp b/engines/fullpipe/scenes/scene21.cpp index 7a61e4862d..be6db90a4a 100644 --- a/engines/fullpipe/scenes/scene21.cpp +++ b/engines/fullpipe/scenes/scene21.cpp @@ -112,9 +112,8 @@ int sceneHandler21(ExCommand *cmd) { g_fp->processArcade(cmd); } } - - break; } + break; case 33: if (g_fp->_aniMan2) { @@ -142,6 +141,9 @@ int sceneHandler21(ExCommand *cmd) { g_fp->startSceneTrack(); break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene22.cpp b/engines/fullpipe/scenes/scene22.cpp index f71460576f..82c9f9307b 100644 --- a/engines/fullpipe/scenes/scene22.cpp +++ b/engines/fullpipe/scenes/scene22.cpp @@ -301,9 +301,9 @@ int sceneHandler22(ExCommand *cmd) { break; case MSG_SC22_CHECKGMABOOT: - if (g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_In_15)) + if (g_fp->getObjectState(sO_Grandma) == g_fp->getObjectEnumState(sO_Grandma, sO_In_15)) { g_fp->setObjectState(sO_Boot_15, g_fp->getObjectEnumState(sO_Boot_15, sO_IsPresent)); - + } break; case MSG_SC22_SHOWSTOOL: @@ -389,6 +389,9 @@ int sceneHandler22(ExCommand *cmd) { } break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene23.cpp b/engines/fullpipe/scenes/scene23.cpp index a2d4f01f2b..2dcaaebc53 100644 --- a/engines/fullpipe/scenes/scene23.cpp +++ b/engines/fullpipe/scenes/scene23.cpp @@ -545,8 +545,11 @@ int sceneHandler23(ExCommand *cmd) { cmd->_messageKind = 0; } - break; } + break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene25.cpp b/engines/fullpipe/scenes/scene25.cpp index d3e3b65350..45fcc1cf53 100644 --- a/engines/fullpipe/scenes/scene25.cpp +++ b/engines/fullpipe/scenes/scene25.cpp @@ -579,6 +579,7 @@ int sceneHandler25(ExCommand *cmd) { g_fp->playSound(SND_25_026, 0); break; + case 2: default: g_fp->playSound(SND_25_027, 0); break; @@ -713,11 +714,14 @@ int sceneHandler25(ExCommand *cmd) { return 0; } - if (picId == PIC_SC25_LADDERUP && !cmd->_param) + if (picId == PIC_SC25_LADDERUP && !cmd->_param) { sceneHandler25_ladderUp(); - - return 0; + } } + break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene26.cpp b/engines/fullpipe/scenes/scene26.cpp index 0efabaeda8..468919f656 100644 --- a/engines/fullpipe/scenes/scene26.cpp +++ b/engines/fullpipe/scenes/scene26.cpp @@ -202,43 +202,43 @@ void sceneHandler26_animateVents(StaticANIObject *ani) { switch (ani->_odelay) { case 0: - if (g_fp->getObjectState(sO_Valve1_26) == g_fp->getObjectEnumState(sO_Valve1_26, sO_Closed)) + if (g_fp->getObjectState(sO_Valve1_26) == g_fp->getObjectEnumState(sO_Valve1_26, sO_Closed)) { qId = QU_SC26_OPEN1; - else + } else { qId = QU_SC26_CLOSE1; - + } break; case 1: - if (g_fp->getObjectState(sO_Valve2_26) == g_fp->getObjectEnumState(sO_Valve2_26, sO_Closed)) + if (g_fp->getObjectState(sO_Valve2_26) == g_fp->getObjectEnumState(sO_Valve2_26, sO_Closed)) { qId = QU_SC26_OPEN2; - else + } else { qId = QU_SC26_CLOSE2; - + } break; case 2: - if (g_fp->getObjectState(sO_Valve3_26) == g_fp->getObjectEnumState(sO_Valve3_26, sO_Closed)) + if (g_fp->getObjectState(sO_Valve3_26) == g_fp->getObjectEnumState(sO_Valve3_26, sO_Closed)) { qId = QU_SC26_OPEN3; - else + } else { qId = QU_SC26_CLOSE3; - + } break; case 3: - if (g_fp->getObjectState(sO_Valve4_26) == g_fp->getObjectEnumState(sO_Valve4_26, sO_Closed)) + if (g_fp->getObjectState(sO_Valve4_26) == g_fp->getObjectEnumState(sO_Valve4_26, sO_Closed)) { qId = QU_SC26_OPEN4; - else + } else { qId = QU_SC26_CLOSE4; - + } break; case 4: - if (g_fp->getObjectState(sO_Valve5_26) == g_fp->getObjectEnumState(sO_Valve5_26, sO_Closed)) + if (g_fp->getObjectState(sO_Valve5_26) == g_fp->getObjectEnumState(sO_Valve5_26, sO_Closed)) { qId = QU_SC26_OPEN5; - else + } else { qId = QU_SC26_CLOSE5; - + } break; default: @@ -316,11 +316,11 @@ int sceneHandler26(ExCommand *cmd) { { StaticANIObject *ani = g_fp->_currentScene->getStaticANIObject1ById(ANI_VENT, cmd->_param); - if (ani && ani->_id == ANI_VENT) + if (ani && ani->_id == ANI_VENT) { sceneHandler26_clickVent(ani, cmd); - - break; + } } + break; case MSG_SC26_HIDEVENT: sceneHandler26_hideVent(); @@ -330,11 +330,11 @@ int sceneHandler26(ExCommand *cmd) { { StaticANIObject *ani = g_fp->_currentScene->getStaticANIObjectAtPos(cmd->_sceneClickX, cmd->_sceneClickY); - if (ani && ani->_id == ANI_VENT) + if (ani && ani->_id == ANI_VENT) { sceneHandler26_clickVent(ani, cmd); - - break; + } } + break; case 33: if (g_fp->_aniMan2) { @@ -352,6 +352,9 @@ int sceneHandler26(ExCommand *cmd) { g_fp->startSceneTrack(); break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene27.cpp b/engines/fullpipe/scenes/scene27.cpp index 171cd6d616..fd23d58394 100644 --- a/engines/fullpipe/scenes/scene27.cpp +++ b/engines/fullpipe/scenes/scene27.cpp @@ -644,7 +644,6 @@ int sceneHandler27(ExCommand *cmd) { g_vars->scene27_wipeIsNeeded = true; g_fp->playSound(SND_27_027, 0); - break; case MSG_SC27_CLICKBET: @@ -652,22 +651,21 @@ int sceneHandler27(ExCommand *cmd) { break; case MSG_SC27_STARTBET: - if (g_vars->scene27_bat) + if (g_vars->scene27_bat) { sceneHandler27_startBat(g_vars->scene27_bat); - + } break; case 30: - if (g_vars->scene27_dudeIsAiming) + if (g_vars->scene27_dudeIsAiming) { sceneHandler27_startAiming(); - + } break; case 29: - if (g_fp->_aniMan == g_fp->_currentScene->getStaticANIObjectAtPos(g_fp->_sceneRect.left + cmd->_x, g_fp->_sceneRect.top + cmd->_y) - && g_vars->scene27_maxPhaseReached) + if (g_fp->_aniMan == g_fp->_currentScene->getStaticANIObjectAtPos(g_fp->_sceneRect.left + cmd->_x, g_fp->_sceneRect.top + cmd->_y) && g_vars->scene27_maxPhaseReached) { sceneHandler27_initAiming(cmd); - + } break; case 33: @@ -697,6 +695,9 @@ int sceneHandler27(ExCommand *cmd) { g_fp->startSceneTrack(); break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene28.cpp b/engines/fullpipe/scenes/scene28.cpp index c5422bf42c..aef714035a 100644 --- a/engines/fullpipe/scenes/scene28.cpp +++ b/engines/fullpipe/scenes/scene28.cpp @@ -257,6 +257,7 @@ void sceneHandler28_clickLift(int numLift) { case 4: x = 1517; break; case 5: x = 1748; break; case 6: x = 1979; break; + default: break; } if (abs(x - g_fp->_aniMan->_ox) > 1 || abs(472 - g_fp->_aniMan->_oy) > 1 @@ -298,7 +299,7 @@ void sceneHandler28_clickLift(int numLift) { sceneHandler28_lift6Start(); break; default: - return; + break; } } } @@ -428,8 +429,8 @@ int sceneHandler28(ExCommand *cmd) { g_fp->processArcade(cmd); } } - break; } + break; case 33: if (g_fp->_aniMan2) { @@ -475,6 +476,9 @@ int sceneHandler28(ExCommand *cmd) { g_fp->startSceneTrack(); break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp index 62af4385ff..5da86b8fb7 100644 --- a/engines/fullpipe/scenes/scene29.cpp +++ b/engines/fullpipe/scenes/scene29.cpp @@ -687,11 +687,9 @@ int sceneHandler29(ExCommand *cmd) { case MSG_SC29_LAUGH: if (g_vars->scene29_hitBall == ANI_SHELL_GREEN) { g_fp->playSound(SND_29_028, 0); - break; + } else { + g_fp->playSound(SND_29_029, 0); } - - g_fp->playSound(SND_29_029, 0); - break; case MSG_SC29_SHOWLASTRED: @@ -719,7 +717,6 @@ int sceneHandler29(ExCommand *cmd) { g_vars->scene29_greenBalls.back()->show1(-1, -1, -1, 0); g_vars->scene29_greenBalls.back()->startAnim(MV_SHG_HITASS, 0, -1); } - break; case MSG_SC29_STOPRIDE: @@ -764,20 +761,17 @@ int sceneHandler29(ExCommand *cmd) { cmd->_messageKind = 0; break; } - break; + } else { + sceneHandler29_manJump(); + cmd->_messageKind = 0; } - - sceneHandler29_manJump(); - - cmd->_messageKind = 0; - break; } break; case 107: - if (g_vars->scene29_arcadeIsOn) + if (g_vars->scene29_arcadeIsOn) { sceneHandler29_manBend(); - + } break; case 33: @@ -827,6 +821,9 @@ int sceneHandler29(ExCommand *cmd) { g_fp->startSceneTrack(); break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene30.cpp b/engines/fullpipe/scenes/scene30.cpp index ce123e30a8..d1faaa7c47 100644 --- a/engines/fullpipe/scenes/scene30.cpp +++ b/engines/fullpipe/scenes/scene30.cpp @@ -127,8 +127,8 @@ int sceneHandler30(ExCommand *cmd) { cmd->_messageKind = 0; } - break; } + break; case 33: if (g_fp->_aniMan2) { @@ -144,6 +144,9 @@ int sceneHandler30(ExCommand *cmd) { g_fp->_behaviorManager->updateBehaviors(); break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene31.cpp b/engines/fullpipe/scenes/scene31.cpp index 3f507e62b7..3c5469052a 100644 --- a/engines/fullpipe/scenes/scene31.cpp +++ b/engines/fullpipe/scenes/scene31.cpp @@ -118,6 +118,9 @@ int sceneHandler31(ExCommand *cmd) { g_fp->_behaviorManager->updateBehaviors(); break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene32.cpp b/engines/fullpipe/scenes/scene32.cpp index d4b4a6527f..46dde6ad83 100644 --- a/engines/fullpipe/scenes/scene32.cpp +++ b/engines/fullpipe/scenes/scene32.cpp @@ -427,6 +427,9 @@ int sceneHandler32(ExCommand *cmd) { cmd->_messageKind = 0; break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene33.cpp b/engines/fullpipe/scenes/scene33.cpp index 6719673c7b..43bfdc71ee 100644 --- a/engines/fullpipe/scenes/scene33.cpp +++ b/engines/fullpipe/scenes/scene33.cpp @@ -284,8 +284,8 @@ int sceneHandler33(ExCommand *cmd) { g_fp->processArcade(cmd); } } - break; } + break; case 33: if (g_fp->_aniMan2) { @@ -308,6 +308,9 @@ int sceneHandler33(ExCommand *cmd) { g_fp->startSceneTrack(); break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene34.cpp b/engines/fullpipe/scenes/scene34.cpp index 5856cdddc3..2a2bbf85da 100644 --- a/engines/fullpipe/scenes/scene34.cpp +++ b/engines/fullpipe/scenes/scene34.cpp @@ -327,7 +327,6 @@ int sceneHandler34(ExCommand *cmd) { getGameLoaderInteractionController()->enableFlag24(); g_fp->_behaviorManager->setFlagByStaticAniObject(g_fp->_aniMan, 1); - break; case MSG_SC34_RETRYVENT: @@ -338,7 +337,6 @@ int sceneHandler34(ExCommand *cmd) { g_fp->_aniMan->_flags &= 0xFEFF; getGameLoaderInteractionController()->handleInteraction(g_fp->_aniMan, g_vars->scene34_vent, cmd->_param); - break; case MSG_SC34_ONBUMP: @@ -445,8 +443,8 @@ int sceneHandler34(ExCommand *cmd) { } } } - break; } + break; case 33: if (g_fp->_aniMan2) { @@ -471,7 +469,9 @@ int sceneHandler34(ExCommand *cmd) { g_fp->_behaviorManager->updateBehaviors(); g_fp->startSceneTrack(); + break; + default: break; } diff --git a/engines/fullpipe/scenes/scene35.cpp b/engines/fullpipe/scenes/scene35.cpp index b23a6397a7..05f69c62b2 100644 --- a/engines/fullpipe/scenes/scene35.cpp +++ b/engines/fullpipe/scenes/scene35.cpp @@ -181,7 +181,6 @@ int sceneHandler35(ExCommand *cmd) { g_fp->playSound(SND_35_012, 1); g_vars->scene35_flowCounter = 0; - break; } break; @@ -224,8 +223,8 @@ int sceneHandler35(ExCommand *cmd) { } } } - break; } + break; case 33: if (g_fp->_aniMan2) { @@ -258,6 +257,9 @@ int sceneHandler35(ExCommand *cmd) { g_fp->startSceneTrack(); break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene36.cpp b/engines/fullpipe/scenes/scene36.cpp index c93fca2cac..effe9b94fe 100644 --- a/engines/fullpipe/scenes/scene36.cpp +++ b/engines/fullpipe/scenes/scene36.cpp @@ -86,6 +86,9 @@ int sceneHandler36(ExCommand *cmd) { g_fp->startSceneTrack(); break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene37.cpp b/engines/fullpipe/scenes/scene37.cpp index bce28ef382..116b045fc9 100644 --- a/engines/fullpipe/scenes/scene37.cpp +++ b/engines/fullpipe/scenes/scene37.cpp @@ -241,7 +241,6 @@ int sceneHandler37(ExCommand *cmd) { sceneHandler37_updateRing(0); sceneHandler37_updateRing(1); sceneHandler37_updateRing(2); - break; case 29: @@ -261,7 +260,6 @@ int sceneHandler37(ExCommand *cmd) { } } } - break; case 33: @@ -324,6 +322,9 @@ int sceneHandler37(ExCommand *cmd) { } break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/scene38.cpp b/engines/fullpipe/scenes/scene38.cpp index 3ff3558802..3632e72973 100644 --- a/engines/fullpipe/scenes/scene38.cpp +++ b/engines/fullpipe/scenes/scene38.cpp @@ -380,8 +380,8 @@ int sceneHandler38(ExCommand *cmd) { cmd->_messageKind = 0; } - break; } + break; case 33: if (g_fp->_aniMan2) { @@ -401,6 +401,9 @@ int sceneHandler38(ExCommand *cmd) { g_fp->startSceneTrack(); break; + + default: + break; } return 0; diff --git a/engines/fullpipe/scenes/sceneFinal.cpp b/engines/fullpipe/scenes/sceneFinal.cpp index 2b4100b8ce..7ff5626042 100644 --- a/engines/fullpipe/scenes/sceneFinal.cpp +++ b/engines/fullpipe/scenes/sceneFinal.cpp @@ -175,6 +175,9 @@ int sceneHandlerFinal(ExCommand *cmd) { g_fp->startSceneTrack(); break; + + default: + break; } updateMusic(); |