diff options
| author | D G Turner | 2019-12-05 22:37:54 +0000 |
|---|---|---|
| committer | D G Turner | 2019-12-05 22:37:54 +0000 |
| commit | 2050ae13b6519cfaf0e72db8a35ebdbd8c2e62eb (patch) | |
| tree | 55c336476528f6c054a7a032d980b95dcf47a116 /engines/neverhood | |
| parent | 89353fb42721d2dd84e53a842e6fd0e600076ff0 (diff) | |
| download | scummvm-rg350-2050ae13b6519cfaf0e72db8a35ebdbd8c2e62eb.tar.gz scummvm-rg350-2050ae13b6519cfaf0e72db8a35ebdbd8c2e62eb.tar.bz2 scummvm-rg350-2050ae13b6519cfaf0e72db8a35ebdbd8c2e62eb.zip | |
NEVERHOOD: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Diffstat (limited to 'engines/neverhood')
48 files changed, 781 insertions, 3 deletions
diff --git a/engines/neverhood/diskplayerscene.cpp b/engines/neverhood/diskplayerscene.cpp index e79f4c9d77..7c1d53ff34 100644 --- a/engines/neverhood/diskplayerscene.cpp +++ b/engines/neverhood/diskplayerscene.cpp @@ -173,6 +173,8 @@ uint32 AsDiskplayerSceneKey::handleMessage(int messageNum, const MessageParam &p case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -219,6 +221,8 @@ uint32 DiskplayerPlayButton::handleMessage(int messageNum, const MessageParam &p updatePosition(); messageResult = 1; break; + default: + break; } return messageResult; } @@ -467,6 +471,8 @@ uint32 DiskplayerScene::handleMessage(int messageNum, const MessageParam ¶m, case 0x2001: stop(); break; + default: + break; } } return 0; diff --git a/engines/neverhood/gamemodule.cpp b/engines/neverhood/gamemodule.cpp index 12ae66658c..cb643b82ee 100644 --- a/engines/neverhood/gamemodule.cpp +++ b/engines/neverhood/gamemodule.cpp @@ -310,6 +310,8 @@ void GameModule::initCrystalColorsPuzzle() { case 'Y': correctColorNum = 2; break; + default: + break; } do { misalignedColorNum = _vm->_rnd->getRandomNumber(6 - 1); @@ -337,6 +339,8 @@ uint32 GameModule::handleMessage(int messageNum, const MessageParam ¶m, Enti _moduleResult = param.asInteger(); _done = true; break; + default: + break; } return messageResult; } @@ -789,6 +793,8 @@ void GameModule::updateModule() { case 9999: createModuleByHash(getGlobalVar(V_MODULE_NAME)); break; + default: + break; } } } diff --git a/engines/neverhood/klaymen.cpp b/engines/neverhood/klaymen.cpp index de940bda79..dcfa26e7c3 100644 --- a/engines/neverhood/klaymen.cpp +++ b/engines/neverhood/klaymen.cpp @@ -83,6 +83,8 @@ uint32 Klaymen::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4818: startWalkToX(_dataResource.getPoint(param.asInteger()).x, false); break; + default: + break; } return 0; } @@ -131,6 +133,8 @@ uint32 Klaymen::hmIdlePickEar(int messageNum, const MessageParam ¶m, Entity playSound(0, 0x44528AA1); } break; + default: + break; } return messageResult; } @@ -157,6 +161,8 @@ uint32 Klaymen::hmIdleSpinHead(int messageNum, const MessageParam ¶m, Entity playSound(0, 0xD948A340); } break; + default: + break; } return messageResult; } @@ -188,6 +194,8 @@ uint32 Klaymen::hmIdleArms(int messageNum, const MessageParam ¶m, Entity *se playSound(0, 0xD073CF14); } break; + default: + break; } return messageResult; } @@ -210,6 +218,8 @@ uint32 Klaymen::hmIdleChest(int messageNum, const MessageParam ¶m, Entity *s playSound(0, 0xD192A368); } break; + default: + break; } return messageResult; } @@ -238,6 +248,8 @@ uint32 Klaymen::hmIdleHeadOff(int messageNum, const MessageParam ¶m, Entity playSound(0, 0x5D418366); } break; + default: + break; } return messageResult; } @@ -347,6 +359,8 @@ uint32 Klaymen::hmPickUpTube(int messageNum, const MessageParam ¶m, Entity * playSound(0, 0x40E5884D); } break; + default: + break; } return messageResult; } @@ -399,6 +413,8 @@ uint32 Klaymen::hmSitInTeleporter(int messageNum, const MessageParam ¶m, Ent playSound(0, 0xC0E4884C); } break; + default: + break; } return messageResult; } @@ -539,6 +555,8 @@ uint32 Klaymen::hmLowLevel(int messageNum, const MessageParam ¶m, Entity *se _pathPoints = NULL; } break; + default: + break; } return messageResult; } @@ -559,6 +577,8 @@ uint32 Klaymen::hmLowLevelAnimation(int messageNum, const MessageParam ¶m, E case NM_ANIMATION_STOP: gotoNextStateExt(); break; + default: + break; } return messageResult; } @@ -582,6 +602,8 @@ uint32 Klaymen::hmStartAction(int messageNum, const MessageParam ¶m, Entity playSound(0, 0x0A2AA8E0); } break; + default: + break; } return messageResult; } @@ -745,6 +767,8 @@ uint32 Klaymen::hmSneaking(int messageNum, const MessageParam ¶m, Entity *se _x = _destX; gotoNextStateExt(); break; + default: + break; } return messageResult; } @@ -778,6 +802,8 @@ uint32 Klaymen::hmStartWalking(int messageNum, const MessageParam ¶m, Entity playSound(0, _soundFlag ? 0x50399F64 : 0x0460E2FA); } break; + default: + break; } return messageResult; } @@ -809,6 +835,8 @@ uint32 Klaymen::hmWalking(int messageNum, const MessageParam ¶m, Entity *sen playSound(0, _soundFlag ? 0x50399F64 : 0x0460E2FA); } break; + default: + break; } return messageResult; } @@ -900,6 +928,8 @@ uint32 Klaymen::hmLever(int messageNum, const MessageParam ¶m, Entity *sende sendMessage(_attachedSprite, NM_MOVE_TO_FRONT, 0); } break; + default: + break; } return messageResult; } @@ -935,6 +965,8 @@ uint32 Klaymen::hmPickUpObject(int messageNum, const MessageParam ¶m, Entity playSound(0, 0x03630300); } break; + default: + break; } return messageResult; @@ -963,6 +995,8 @@ uint32 Klaymen::hmPressButton(int messageNum, const MessageParam ¶m, Entity playSound(0, 0x0A2AA8E0); } break; + default: + break; } return messageResult; } @@ -1053,6 +1087,9 @@ uint32 Klaymen::hmWalkingSmall(int messageNum, const MessageParam ¶m, Entity playSound(0, 0x4924AAC4); else if (param.asInteger() == 0x0A2A9098) playSound(0, 0x0A2AA8E0); + break; + default: + break; } return messageResult; } @@ -1115,6 +1152,8 @@ uint32 Klaymen::hmWalkFrontBackSmall(int messageNum, const MessageParam ¶m, else if (param.asInteger() == 0x0A2A9098) playSound(0, 0x0A2AA8E0); break; + default: + break; } return messageResult; } @@ -1195,6 +1234,8 @@ uint32 Klaymen::hmPullReleaseCord(int messageNum, const MessageParam ¶m, Ent sendMessage(_attachedSprite, NM_MOVE_TO_FRONT, 0); } break; + default: + break; } return messageResult; } @@ -1231,6 +1272,8 @@ uint32 Klaymen::hmUseTube(int messageNum, const MessageParam ¶m, Entity *sen else if (param.asInteger() == 0x925A0C1E) playSound(0, 0x40E5884D); break; + default: + break; } return messageResult; } @@ -1380,6 +1423,8 @@ uint32 Klaymen::hmLargeStep(int messageNum, const MessageParam ¶m, Entity *s _x = _destX; gotoNextStateExt(); break; + default: + break; } return messageResult; } @@ -1421,6 +1466,8 @@ uint32 Klaymen::hmTurnToUse(int messageNum, const MessageParam ¶m, Entity *s playSound(0, 0x0A2AA8E0); } break; + default: + break; } return messageResult; } @@ -1467,6 +1514,8 @@ uint32 Klaymen::hmPeekWall(int messageNum, const MessageParam ¶m, Entity *se playSound(0, 0x0460E2FA); } break; + default: + break; } return hmLowLevelAnimation(messageNum, param, sender); } @@ -1570,6 +1619,8 @@ uint32 Klaymen::hmClimbLadderHalf(int messageNum, const MessageParam ¶m, Ent playSound(0, 0x0460E2FA); } break; + default: + break; } return messageResult; } @@ -1596,6 +1647,8 @@ uint32 Klaymen::hmClimbLadderUpDown(int messageNum, const MessageParam ¶m, E } } break; + default: + break; } return messageResult; } @@ -1650,6 +1703,8 @@ uint32 Klaymen::hmWalkToFront(int messageNum, const MessageParam ¶m, Entity playSound(0, _soundFlag ? 0x50399F64 : 0x0460E2FA); } break; + default: + break; } return messageResult; } @@ -1704,6 +1759,8 @@ uint32 Klaymen::hmLandOnFeet(int messageNum, const MessageParam ¶m, Entity * playSound(0, 0x5860C640); } break; + default: + break; } return messageResult; } @@ -1731,6 +1788,8 @@ uint32 Klaymen::hmTurnToBackToUse(int messageNum, const MessageParam ¶m, Ent playSound(0, 0x0A2AA8E0); } break; + default: + break; } return messageResult; } @@ -1807,6 +1866,8 @@ uint32 Klaymen::hmMoveObjectTurn(int messageNum, const MessageParam ¶m, Enti case NM_KLAYMEN_MOVE_OBJECT: _isMoveObjectRequested = true; return 0; + default: + break; } return hmLowLevelAnimation(messageNum, param, sender); } @@ -1946,6 +2007,9 @@ uint32 Klaymen::hmInsertDisk(int messageNum, const MessageParam ¶m, Entity * } else if (param.asInteger() == 0x0E040501) { playSound(1, 0xC6A129C1); } + break; + default: + break; } return messageResult; } @@ -2009,6 +2073,8 @@ void Klaymen::enterIdleAnimation(uint idleAnimation) { case kIdleWonderAbout: stIdleWonderAbout(); break; + default: + break; } } @@ -2043,6 +2109,8 @@ uint32 Klaymen::hmJumpToGrab(int messageNum, const MessageParam ¶m, Entity * else if (param.asInteger() == 0x88001184) sendMessage(_attachedSprite, NM_MOVE_TO_FRONT, 0); break; + default: + break; } return messageResult; } @@ -2063,6 +2131,8 @@ uint32 Klaymen::hmFinishGrow(int messageNum, const MessageParam ¶m, Entity * if (param.asInteger() == 0x040C4C01) playSound(0, 0x01E11140); break; + default: + break; } return messageResult; } @@ -2107,6 +2177,8 @@ uint32 Klaymen::hmJumpToGrabRelease(int messageNum, const MessageParam ¶m, E if (param.asInteger() == 0x320AC306) playSound(0, 0x5860C640); break; + default: + break; } return messageResult; } @@ -2159,6 +2231,8 @@ uint32 Klaymen::hmTeleporterAppearDisappear(int messageNum, const MessageParam & playSound(0, 0xC5B709B0); } break; + default: + break; } return messageResult; } @@ -2223,6 +2297,8 @@ uint32 Klaymen::hmDrinkPotion(int messageNum, const MessageParam ¶m, Entity else if (param.asInteger() == 0x82022030) playSound(0, 0x5C48C0E8); break; + default: + break; } return messageResult; } @@ -2256,6 +2332,8 @@ uint32 Klaymen::hmGrow(int messageNum, const MessageParam ¶m, Entity *sender else if (param.asInteger() == 0x08040840) setDoDeltaX(2); break; + default: + break; } return messageResult; } @@ -2301,6 +2379,8 @@ uint32 Klaymen::hmInsertKey(int messageNum, const MessageParam ¶m, Entity *s playSound(0, 0xDC4A1280); } break; + default: + break; } return messageResult; } @@ -2355,6 +2435,8 @@ uint32 Klaymen::hmPeekWallReturn(int messageNum, const MessageParam ¶m, Enti playSound(0, 0x44051000); } break; + default: + break; } return messageResult; } @@ -2434,6 +2516,8 @@ uint32 Klaymen::hmStandIdleSpecial(int messageNum, const MessageParam ¶m, En stSpitOutFall2(); } break; + default: + break; } return 0; } @@ -2546,6 +2630,8 @@ uint32 Klaymen::hmMoveObject(int messageNum, const MessageParam ¶m, Entity * } } break; + default: + break; } return Klaymen::hmLowLevelAnimation(messageNum, param, sender); } diff --git a/engines/neverhood/menumodule.cpp b/engines/neverhood/menumodule.cpp index 3c16122b8d..a7752626d6 100644 --- a/engines/neverhood/menumodule.cpp +++ b/engines/neverhood/menumodule.cpp @@ -132,6 +132,8 @@ void MenuModule::createScene(int sceneNum, int which) { case QUERY_OVR_MENU: _childObject = new QueryOverwriteMenu(_vm, this, _savegameDescription); break; + default: + break; } SetUpdateHandler(&MenuModule::updateScene); _childObject->handleUpdate(); @@ -332,6 +334,8 @@ uint32 MenuButton::handleMessage(int messageNum, const MessageParam ¶m, Enti } messageResult = 1; break; + default: + break; } return messageResult; } @@ -390,6 +394,8 @@ uint32 MainMenu::handleMessage(int messageNum, const MessageParam ¶m, Entity case NM_ANIMATION_UPDATE: leaveScene(param.asInteger()); break; + default: + break; } return 0; } @@ -472,6 +478,8 @@ uint32 CreditsScene::handleMessage(int messageNum, const MessageParam ¶m, En case NM_MOUSE_SHOW: _ticksTime = _ticksDuration + _vm->_system->getMillis(); break; + default: + break; } return 0; } @@ -537,6 +545,8 @@ uint32 Widget::handleMessage(int messageNum, const MessageParam ¶m, Entity * onClick(); messageResult = 1; break; + default: + break; } return messageResult; } @@ -762,6 +772,8 @@ uint32 TextEditWidget::handleMessage(int messageNum, const MessageParam ¶m, case 0x000B: handleKeyDown((Common::KeyCode)param.asInteger()); break; + default: + break; } return messageResult; } @@ -1028,6 +1040,8 @@ uint32 GameStateMenu::handleMessage(int messageNum, const MessageParam ¶m, E case 5: _listBox->pageDown(); break; + default: + break; } break; case NM_MOUSE_WHEELUP: @@ -1036,6 +1050,8 @@ uint32 GameStateMenu::handleMessage(int messageNum, const MessageParam ¶m, E case NM_MOUSE_WHEELDOWN: _listBox->scrollDown(); break; + default: + break; } return 0; } @@ -1203,6 +1219,8 @@ uint32 QueryOverwriteMenu::handleMessage(int messageNum, const MessageParam &par // Handle menu button click leaveScene(param.asInteger()); break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module1000.cpp b/engines/neverhood/modules/module1000.cpp index 5e4d67d2bc..6761557a0b 100644 --- a/engines/neverhood/modules/module1000.cpp +++ b/engines/neverhood/modules/module1000.cpp @@ -76,6 +76,8 @@ void Module1000::createScene(int sceneNum, int which) { _vm->_soundMan->startMusic(_musicFileHash, 0, 0); _childObject = new Scene1005(_vm, this, which); break; + default: + break; } SetUpdateHandler(&Module1000::updateScene); _childObject->handleUpdate(); @@ -115,6 +117,8 @@ void Module1000::updateScene() { _vm->_soundMan->stopMusic(_musicFileHash, 0, 1); createScene(3, 1); break; + default: + break; } } } @@ -223,6 +227,8 @@ uint32 Scene1001::handleMessage(int messageNum, const MessageParam ¶m, Entit case NM_KLAYMEN_LOWER_LEVER: sendMessage(_asHammer, 0x2000, 0); break; + default: + break; } return messageResult; } @@ -454,6 +460,8 @@ uint32 Scene1002::handleMessage(int messageNum, const MessageParam ¶m, Entit setSpriteSurfacePriority(_ssCeiling, 1015); setSpriteSurfacePriority(_ssLadderArch, 1015); break; + default: + break; } return messageResult; } @@ -536,6 +544,8 @@ uint32 Scene1004::handleMessage(int messageNum, const MessageParam ¶m, Entit case NM_POSITION_CHANGE: sendMessage(_asTrashCan, NM_POSITION_CHANGE, 0); break; + default: + break; } return messageResult; } @@ -585,6 +595,8 @@ uint32 Scene1005::handleMessage(int messageNum, const MessageParam ¶m, Entit if (param.asPoint().x <= 20 || param.asPoint().x >= 620) leaveScene(0); break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module1000_sprites.cpp b/engines/neverhood/modules/module1000_sprites.cpp index dd504ae25a..3714b82506 100644 --- a/engines/neverhood/modules/module1000_sprites.cpp +++ b/engines/neverhood/modules/module1000_sprites.cpp @@ -45,6 +45,8 @@ uint32 AsScene1001Door::handleMessage(int messageNum, const MessageParam ¶m, case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return 0; } @@ -129,6 +131,8 @@ uint32 AsScene1001Hammer::handleMessage(int messageNum, const MessageParam ¶ playSound(0, 0xE741020A); _newStickFrameIndex = STICK_LAST_FRAME; break; + default: + break; } return 0; } @@ -160,6 +164,8 @@ uint32 AsScene1001Window::handleMessage(int messageNum, const MessageParam ¶ setGlobalVar(V_WINDOW_OPEN, 1); setVisible(false); break; + default: + break; } return 0; } @@ -203,6 +209,8 @@ uint32 AsScene1001Lever::handleMessage(int messageNum, const MessageParam ¶m case NM_MOVE_TO_FRONT: sendMessage(_parentScene, NM_PRIORITY_CHANGE, 1010); break; + default: + break; } return messageResult; } @@ -231,6 +239,8 @@ uint32 SsCommonButtonSprite::handleMessage(int messageNum, const MessageParam &p _countdown = 8; playSound(0, _soundFileHash); break; + default: + break; } return messageResult; } @@ -290,6 +300,8 @@ uint32 AsScene1002Ring::hmRingIdle(int messageNum, const MessageParam ¶m, En case NM_MOVE_TO_FRONT: sendMessage(_parentScene, NM_PRIORITY_CHANGE, 1010); break; + default: + break; } return messageResult; } @@ -313,6 +325,8 @@ uint32 AsScene1002Ring::hmRingPulled1(int messageNum, const MessageParam ¶m, case NM_MOVE_TO_FRONT: sendMessage(_parentScene, NM_PRIORITY_CHANGE, 1010); break; + default: + break; } return messageResult; } @@ -330,6 +344,8 @@ uint32 AsScene1002Ring::hmRingPulled2(int messageNum, const MessageParam ¶m, case NM_MOVE_TO_FRONT: sendMessage(_parentScene, NM_PRIORITY_CHANGE, 1010); break; + default: + break; } return messageResult; } @@ -349,6 +365,8 @@ uint32 AsScene1002Ring::hmRingHangingLow(int messageNum, const MessageParam &par case NM_MOVE_TO_FRONT: sendMessage(_parentScene, NM_PRIORITY_CHANGE, 1010); break; + default: + break; } return messageResult; } @@ -369,6 +387,8 @@ uint32 AsScene1002Ring::hmRingReleased(int messageNum, const MessageParam ¶m case NM_MOVE_TO_FRONT: sendMessage(_parentScene, NM_PRIORITY_CHANGE, 1010); break; + default: + break; } return messageResult; } @@ -399,6 +419,8 @@ uint32 AsScene1002Door::handleMessage(int messageNum, const MessageParam ¶m, setGlobalVar(V_FLYTRAP_RING_DOOR, 0); SetSpriteUpdate(&AsScene1002Door::suCloseDoor); break; + default: + break; } return messageResult; } @@ -447,6 +469,8 @@ uint32 AsScene1002BoxingGloveHitEffect::handleMessage(int messageNum, const Mess stopAnimation(); setVisible(false); break; + default: + break; } return messageResult; } @@ -476,6 +500,8 @@ uint32 AsScene1002DoorSpy::handleMessage(int messageNum, const MessageParam &par case 0x2003: stDoorSpyBoxingGlove(); break; + default: + break; } return messageResult; } @@ -486,6 +512,8 @@ uint32 AsScene1002DoorSpy::hmDoorSpyAnimation(int messageNum, const MessageParam case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -556,6 +584,8 @@ uint32 SsCommonPressButton::handleMessage(int messageNum, const MessageParam &pa setVisible(true); playSound(0, _soundFileHash); break; + default: + break; } return messageResult; } @@ -666,6 +696,8 @@ uint32 AsScene1002VenusFlyTrap::handleMessage(int messageNum, const MessageParam case NM_MOVE_TO_FRONT: sendMessage(_parentScene, NM_PRIORITY_CHANGE, 1015); break; + default: + break; } return messageResult; } @@ -676,6 +708,8 @@ uint32 AsScene1002VenusFlyTrap::hmAnimationSimple(int messageNum, const MessageP case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -707,6 +741,8 @@ uint32 AsScene1002VenusFlyTrap::hmAnimationExt(int messageNum, const MessagePara case NM_MOVE_TO_FRONT: sendMessage(_parentScene, NM_PRIORITY_CHANGE, 1015); break; + default: + break; } return messageResult; } @@ -841,6 +877,8 @@ uint32 AsScene1002OutsideDoorBackground::handleMessage(int messageNum, const Mes _isDoorClosed = true; _countdown = 2; break; + default: + break; } return messageResult; } @@ -851,6 +889,8 @@ uint32 AsScene1002OutsideDoorBackground::hmAnimation(int messageNum, const Messa case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -942,6 +982,8 @@ uint32 AsScene1002KlaymenPeekHand::handleMessage(int messageNum, const MessagePa setClipRect(_savedClipRect); } break; + default: + break; } return messageResult; } @@ -972,6 +1014,8 @@ uint32 AsScene1004TrashCan::handleMessage(int messageNum, const MessageParam &pa stopAnimation(); setVisible(false); break; + default: + break; } return 0; } @@ -1050,6 +1094,8 @@ uint32 KmScene1001::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return 0; } @@ -1080,6 +1126,8 @@ uint32 KmScene1001::hmSleeping(int messageNum, const MessageParam ¶m, Entity playSound(0, 0xC0238244); } break; + default: + break; } return messageResult; } @@ -1102,6 +1150,8 @@ uint32 KmScene1001::hmPullHammerLever(int messageNum, const MessageParam ¶m, if (param.asInteger() == 0x4AB28209) sendMessage(_attachedSprite, NM_KLAYMEN_LOWER_LEVER, 0); break; + default: + break; } return messageResult; } @@ -1162,6 +1212,8 @@ uint32 KmScene1002::xHandleMessage(int messageNum, const MessageParam ¶m) { case 4: GotoState(&KmScene1002::stJumpToRing4); break; + default: + break; } break; case NM_KLAYMEN_MOVE_OBJECT: @@ -1217,6 +1269,8 @@ uint32 KmScene1002::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return 0; } @@ -1245,6 +1299,8 @@ uint32 KmScene1002::hmJumpToRing(int messageNum, const MessageParam ¶m, Enti sendMessage(_attachedSprite, NM_MOVE_TO_FRONT, 0); } break; + default: + break; } return messageResult; } @@ -1301,6 +1357,8 @@ uint32 KmScene1002::hmJumpToRing3(int messageNum, const MessageParam ¶m, Ent sendMessage(_attachedSprite, NM_MOVE_TO_FRONT, 0); } break; + default: + break; } return messageResult; } @@ -1357,6 +1415,8 @@ uint32 KmScene1002::hmJumpToRingVenusFlyTrap(int messageNum, const MessageParam sendMessage(_attachedSprite, NM_MOVE_TO_FRONT, 0); } break; + default: + break; } return messageResult; } @@ -1397,6 +1457,8 @@ uint32 KmScene1002::hmJumpAndFall(int messageNum, const MessageParam ¶m, Ent playSound(0, 0x40428A09); } break; + default: + break; } return messageResult; } @@ -1454,6 +1516,8 @@ uint32 KmScene1002::hmMoveVenusFlyTrap(int messageNum, const MessageParam ¶m case NM_KLAYMEN_MOVE_OBJECT: _isMoveObjectRequested = true; return 0; + default: + break; } return hmLowLevelAnimation(messageNum, param, sender); } @@ -1472,6 +1536,8 @@ uint32 KmScene1002::hmFirstMoveVenusFlyTrap(int messageNum, const MessageParam & playSound(0, 0x0460E2FA); } break; + default: + break; } return messageResult; } @@ -1514,6 +1580,8 @@ uint32 KmScene1002::hmPressDoorButton(int messageNum, const MessageParam ¶m, sendMessage(_attachedSprite, 0x480B, 0); } break; + default: + break; } return messageResult; } @@ -1537,6 +1605,8 @@ uint32 KmScene1002::hmHitByBoxingGlove(int messageNum, const MessageParam ¶m playSound(0, 0x40608A59); } break; + default: + break; } return messageResult; } @@ -1603,6 +1673,8 @@ uint32 KmScene1004::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return 0; } @@ -1616,6 +1688,8 @@ uint32 KmScene1004::hmReadNote(int messageNum, const MessageParam ¶m, Entity sendMessage(_parentScene, NM_POSITION_CHANGE, 0); } break; + default: + break; } return messageResult; } diff --git a/engines/neverhood/modules/module1100.cpp b/engines/neverhood/modules/module1100.cpp index cca80f3f62..fe6ef684d9 100644 --- a/engines/neverhood/modules/module1100.cpp +++ b/engines/neverhood/modules/module1100.cpp @@ -126,6 +126,8 @@ void Module1100::createScene(int sceneNum, int which) { _vm->_soundMan->setTwoSoundsPlayFlag(true); createSmackerScene(0x00012211, true, true, false); break; + default: + break; } SetUpdateHandler(&Module1100::updateScene); _childObject->handleUpdate(); @@ -211,6 +213,8 @@ void Module1100::updateScene() { _vm->_soundMan->playTwoSounds(0x0002C818, 0x48498E46, 0x50399F64, 0); createScene(1, 1); break; + default: + break; } } else { switch (_sceneNum) { @@ -238,6 +242,8 @@ void Module1100::updateScene() { _vm->_soundMan->setSoundVolume(0x50399F64, 65); } break; + default: + break; } } } @@ -375,6 +381,8 @@ uint32 Scene1105::handleMessage(int messageNum, const MessageParam ¶m, Entit } } break; + default: + break; } return messageResult; } @@ -527,6 +535,8 @@ uint32 Scene1109::handleMessage(int messageNum, const MessageParam ¶m, Entit _klaymen->setKlaymenIdleTable1(); } break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module1100_sprites.cpp b/engines/neverhood/modules/module1100_sprites.cpp index b5fd8490f6..2f9f098332 100644 --- a/engines/neverhood/modules/module1100_sprites.cpp +++ b/engines/neverhood/modules/module1100_sprites.cpp @@ -67,6 +67,8 @@ uint32 SsScene1105Button::handleMessage(int messageNum, const MessageParam ¶ setVisible(true); playSound(0, 0x44141000); break; + default: + break; } return messageResult; } @@ -99,6 +101,8 @@ uint32 SsScene1105SymbolDie::handleMessage(int messageNum, const MessageParam &p case NM_ANIMATION_UPDATE: loadSymbolSprite(); break; + default: + break; } return messageResult; } @@ -146,6 +150,8 @@ uint32 AsScene1105TeddyBear::handleMessage(int messageNum, const MessageParam &p sendMessage(_parentScene, 0x2003, 0); stopAnimation(); break; + default: + break; } return messageResult; } @@ -193,6 +199,8 @@ uint32 SsScene1105OpenButton::handleMessage(int messageNum, const MessageParam & } messageResult = 1; break; + default: + break; } return messageResult; } @@ -258,6 +266,8 @@ uint32 KmScene1109::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x483E: teleporterDisappear(0x3C2E4245); break; + default: + break; } return messageResult; } diff --git a/engines/neverhood/modules/module1200.cpp b/engines/neverhood/modules/module1200.cpp index ba5e18ab15..cbfd6c8c95 100644 --- a/engines/neverhood/modules/module1200.cpp +++ b/engines/neverhood/modules/module1200.cpp @@ -63,6 +63,8 @@ void Module1200::createScene(int sceneNum, int which) { createSmackerScene(0x31890001, true, true, false); setGlobalVar(V_SEEN_CREATURE_EXPLODE_VID, 1); break; + default: + break; } SetUpdateHandler(&Module1200::updateScene); _childObject->handleUpdate(); @@ -89,6 +91,8 @@ void Module1200::updateScene() { _vm->_soundMan->startMusic(0x62222CAE, 0, 0); createScene(0, 3); break; + default: + break; } } } @@ -349,6 +353,8 @@ uint32 Scene1201::handleMessage(int messageNum, const MessageParam ¶m, Entit case 0x8000: sendMessage(_asKlaymenHead, NM_KLAYMEN_STOP_CLIMBING, 0); break; + default: + break; } return messageResult; } @@ -437,6 +443,8 @@ uint32 Scene1202::handleMessage(int messageNum, const MessageParam ¶m, Entit case NM_POSITION_CHANGE: _counter--; break; + default: + break; } return messageResult; } @@ -448,6 +456,8 @@ uint32 Scene1202::hmSolved(int messageNum, const MessageParam ¶m, Entity *se if (param.asPoint().x <= 20 || param.asPoint().x >= 620) leaveScene(0); break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module1200_sprites.cpp b/engines/neverhood/modules/module1200_sprites.cpp index 04bd4c1cb7..88b486bef6 100644 --- a/engines/neverhood/modules/module1200_sprites.cpp +++ b/engines/neverhood/modules/module1200_sprites.cpp @@ -77,6 +77,8 @@ uint32 AsScene1201Tape::handleMessage(int messageNum, const MessageParam ¶m, setVisible(false); SetMessageHandler(NULL); break; + default: + break; } return messageResult; } @@ -109,6 +111,8 @@ uint32 AsScene1201TntManRope::handleMessage(int messageNum, const MessageParam & startAnimation(0x928F0C10, 1, -1); _newStickFrameIndex = STICK_LAST_FRAME; break; + default: + break; } return messageResult; } @@ -147,6 +151,8 @@ uint32 AsScene1201RightDoor::handleMessage(int messageNum, const MessageParam &p case 0x4829: stOpenDoor(); break; + default: + break; } return messageResult; } @@ -195,6 +201,8 @@ uint32 AsScene1201KlaymenHead::handleMessage(int messageNum, const MessageParam setVisible(false); gotoNextState(); break; + default: + break; } return messageResult; } @@ -239,6 +247,8 @@ uint32 AsScene1201TntMan::handleMessage(int messageNum, const MessageParam ¶ stMoving(); } break; + default: + break; } return messageResult; @@ -250,6 +260,8 @@ uint32 AsScene1201TntMan::hmComingDown(int messageNum, const MessageParam ¶m case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -339,6 +351,8 @@ AsScene1201Match::AsScene1201Match(NeverhoodEngine *vm, Scene *parentScene) _status = 0; stIdleOnFloor(); break; + default: + break; } } @@ -357,6 +371,8 @@ uint32 AsScene1201Match::hmOnDoorFrameAboutToMove(int messageNum, const MessageP if (param.asInteger() == 0x86668011) playSound(0); break; + default: + break; } return messageResult; } @@ -367,6 +383,8 @@ uint32 AsScene1201Match::hmOnDoorFrameMoving(int messageNum, const MessageParam case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -382,6 +400,8 @@ uint32 AsScene1201Match::hmIdle(int messageNum, const MessageParam ¶m, Entit setVisible(false); setGlobalVar(V_MATCH_STATUS, 3); break; + default: + break; } return messageResult; } @@ -469,6 +489,8 @@ uint32 AsScene1201Creature::hmWaiting(int messageNum, const MessageParam ¶m, case NM_KLAYMEN_STOP_CLIMBING: GotoState(&AsScene1201Creature::stPincerSnapKlaymen); break; + default: + break; } return messageResult; } @@ -479,6 +501,8 @@ uint32 AsScene1201Creature::hmPincerSnap(int messageNum, const MessageParam &par case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -496,6 +520,8 @@ uint32 AsScene1201Creature::hmPincerSnapKlaymen(int messageNum, const MessagePar case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -559,6 +585,8 @@ uint32 AsScene1201LeftDoor::handleMessage(int messageNum, const MessageParam &pa case NM_KLAYMEN_CLOSE_DOOR: stCloseDoor(); break; + default: + break; } return messageResult; } @@ -612,6 +640,8 @@ uint32 AsScene1202TntItem::hmShowIdle(int messageNum, const MessageParam ¶m, _newPosition = (int)param.asInteger(); stChangePositionFadeOut(); break; + default: + break; } return messageResult; } @@ -622,6 +652,8 @@ uint32 AsScene1202TntItem::hmChangePosition(int messageNum, const MessageParam & case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -722,6 +754,8 @@ uint32 KmScene1201::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return 0; } @@ -768,6 +802,8 @@ uint32 KmScene1201::hmMatch(int messageNum, const MessageParam ¶m, Entity *s playSound(0, 0x44051000); } break; + default: + break; } return messageResult; } @@ -803,6 +839,8 @@ uint32 KmScene1201::hmTumbleHeadless(int messageNum, const MessageParam ¶m, playSound(0, 0x74E2810F); } break; + default: + break; } return messageResult; } diff --git a/engines/neverhood/modules/module1300.cpp b/engines/neverhood/modules/module1300.cpp index 65bd353576..c782870f60 100644 --- a/engines/neverhood/modules/module1300.cpp +++ b/engines/neverhood/modules/module1300.cpp @@ -214,6 +214,8 @@ void Module1300::createScene(int sceneNum, int which) { _vm->_soundMan->stopMusic(0x00203197, 0, 2); _childObject = new CreditsScene(_vm, this, false); break; + default: + break; } SetUpdateHandler(&Module1300::updateScene); _childObject->handleUpdate(); @@ -307,6 +309,8 @@ void Module1300::updateScene() { case 17: leaveModule(1); break; + default: + break; } } } @@ -470,6 +474,8 @@ uint32 Scene1302::handleMessage(int messageNum, const MessageParam ¶m, Entit case 0x8001: setSpriteSurfacePriority(_class595, 1015); break; + default: + break; } return messageResult; } @@ -509,6 +515,8 @@ uint32 Scene1303::handleMessage(int messageNum, const MessageParam ¶m, Entit if (sender == _asBalloon && getGlobalVar(V_HAS_NEEDLE)) setMessageList(0x004AF9B8); break; + default: + break; } return 0; } @@ -573,6 +581,8 @@ uint32 Scene1304::handleMessage(int messageNum, const MessageParam ¶m, Entit setMessageList(0x004B9140); } break; + default: + break; } return 0; } @@ -745,6 +755,8 @@ uint32 Scene1306::handleMessage(int messageNum, const MessageParam ¶m, Entit sendMessage(this, 0x2000, 0); addCollisionSprite(_asTape); break; + default: + break; } return 0; } @@ -771,6 +783,8 @@ uint32 Scene1306::handleMessage416EB0(int messageNum, const MessageParam ¶m, sendMessage(this, 0x2000, 0); addCollisionSprite(_asTape); break; + default: + break; } return 0; } @@ -821,7 +835,6 @@ Scene1307::Scene1307(NeverhoodEngine *vm, Module *parentModule) } loadSound(0, 0x68E25540); - } void Scene1307::update() { @@ -901,6 +914,8 @@ uint32 Scene1307::handleMessage(int messageNum, const MessageParam ¶m, Entit if (getSubVar(VA_IS_KEY_INSERTED, keyIndex) && _asKeys[keyIndex]) sendMessage(_asKeys[keyIndex], 0x2000, 0); break; + default: + break; } return messageResult; } @@ -1089,6 +1104,8 @@ uint32 Scene1308::handleMessage(int messageNum, const MessageParam ¶m, Entit } } break; + default: + break; } return 0; } @@ -1145,6 +1162,8 @@ uint32 Scene1317::handleMessage(int messageNum, const MessageParam ¶m, Entit case NM_ANIMATION_STOP: stChooseKing(); break; + default: + break; } return messageResult; } @@ -1164,6 +1183,8 @@ uint32 Scene1317::hmChooseKing(int messageNum, const MessageParam ¶m, Entity stKlaymenAsKing(); } break; + default: + break; } return messageResult; } @@ -1174,6 +1195,8 @@ uint32 Scene1317::hmHoborgAsKing(int messageNum, const MessageParam ¶m, Enti case NM_ANIMATION_STOP: stEndMovie(); break; + default: + break; } return messageResult; } @@ -1184,6 +1207,8 @@ uint32 Scene1317::hmEndMovie(int messageNum, const MessageParam ¶m, Entity * case NM_ANIMATION_STOP: leaveScene(0); break; + default: + break; } return messageResult; } diff --git a/engines/neverhood/modules/module1300_sprites.cpp b/engines/neverhood/modules/module1300_sprites.cpp index b4b42198e1..05f43e773d 100644 --- a/engines/neverhood/modules/module1300_sprites.cpp +++ b/engines/neverhood/modules/module1300_sprites.cpp @@ -55,6 +55,8 @@ uint32 AsScene1302Bridge::handleMessage(int messageNum, const MessageParam ¶ case NM_KLAYMEN_CLOSE_DOOR: stRaiseBridge(); break; + default: + break; } return messageResult; } @@ -109,6 +111,8 @@ uint32 SsScene1302Fence::handleMessage(int messageNum, const MessageParam ¶m SetMessageHandler(NULL); SetSpriteUpdate(&SsScene1302Fence::suMoveUp); break; + default: + break; } return messageResult; } @@ -153,6 +157,8 @@ uint32 AsScene1303Balloon::handleMessage(int messageNum, const MessageParam &par case NM_ANIMATION_UPDATE: stPopBalloon(); break; + default: + break; } return messageResult; } @@ -170,6 +176,8 @@ uint32 AsScene1303Balloon::hmBalloonPopped(int messageNum, const MessageParam &p setVisible(false); SetMessageHandler(NULL); break; + default: + break; } return messageResult; } @@ -198,6 +206,8 @@ uint32 AsScene1304Needle::handleMessage(int messageNum, const MessageParam ¶ setVisible(false); SetMessageHandler(NULL); break; + default: + break; } return messageResult; } @@ -248,6 +258,8 @@ uint32 AsScene1306Elevator::handleMessage(int messageNum, const MessageParam &pa if (_isDown) stGoingUp(); break; + default: + break; } return messageResult; } @@ -376,6 +388,8 @@ uint32 AsScene1307Key::handleMessage(int messageNum, const MessageParam ¶m, playSound(2); stInsert(); break; + default: + break; } return messageResult; } @@ -489,6 +503,8 @@ uint32 AsScene1308JaggyDoor::handleMessage(int messageNum, const MessageParam &p case NM_KLAYMEN_CLOSE_DOOR: stCloseDoor(); break; + default: + break; } return messageResult; } @@ -533,6 +549,8 @@ uint32 AsScene1308KeyboardDoor::handleMessage(int messageNum, const MessageParam case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -571,6 +589,8 @@ uint32 AsScene1308LightWallSymbols::handleMessage(int messageNum, const MessageP case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -623,6 +643,8 @@ uint32 AsScene1308Mouse::handleMessage(int messageNum, const MessageParam ¶m else if (param.asInteger() == 0x462F0410) playSound(0, 0x60984E28); break; + default: + break; } return messageResult; } @@ -644,6 +666,8 @@ uint32 KmScene1303::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x483C: GotoState(&Klaymen::stPeekWall2); break; + default: + break; } return 0; } @@ -695,6 +719,8 @@ uint32 KmScene1304::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return 0; } @@ -721,6 +747,8 @@ uint32 KmScene1305::xHandleMessage(int messageNum, const MessageParam ¶m) { setDoDeltaX(param.asInteger()); gotoNextStateExt(); break; + default: + break; } return 0; } @@ -858,6 +886,8 @@ uint32 KmScene1306::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return messageResult; } @@ -928,6 +958,8 @@ uint32 KmScene1308::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module1400.cpp b/engines/neverhood/modules/module1400.cpp index 465ad5909a..52e8d37623 100644 --- a/engines/neverhood/modules/module1400.cpp +++ b/engines/neverhood/modules/module1400.cpp @@ -89,6 +89,8 @@ void Module1400::createScene(int sceneNum, int which) { _vm->_soundMan->stopMusic(0x06333232, 0, 2); _childObject = new Scene1407(_vm, this); break; + default: + break; } SetUpdateHandler(&Module1400::updateScene); _childObject->handleUpdate(); @@ -133,6 +135,8 @@ void Module1400::updateScene() { case 6: createScene(1, 2); break; + default: + break; } } } @@ -275,6 +279,8 @@ uint32 Scene1401::handleMessage(int messageNum, const MessageParam ¶m, Entit if (_asProjector) sendMessage(_asProjector, NM_MOVE_TO_BACK, 0); break; + default: + break; } return 0; } @@ -415,6 +421,8 @@ uint32 Scene1402::handleMessage(int messageNum, const MessageParam ¶m, Entit setMessageList2(0x004B0B68); } break; + default: + break; } return 0; } @@ -480,6 +488,8 @@ uint32 Scene1407::handleMessage(int messageNum, const MessageParam ¶m, Entit showMouse(false); _puzzleSolvedCountdown = 72; break; + default: + break; } return 0; } @@ -582,6 +592,8 @@ uint32 Scene1403::handleMessage(int messageNum, const MessageParam ¶m, Entit } } break; + default: + break; } return 0; } @@ -681,6 +693,8 @@ uint32 Scene1404::handleMessage(int messageNum, const MessageParam ¶m, Entit setMessageList(0x004B8D18); } break; + default: + break; } return 0; } @@ -749,6 +763,8 @@ uint32 Scene1405::handleMessage(int messageNum, const MessageParam ¶m, Entit } } break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module1400_sprites.cpp b/engines/neverhood/modules/module1400_sprites.cpp index 99a2a314a7..67b30ca1c8 100644 --- a/engines/neverhood/modules/module1400_sprites.cpp +++ b/engines/neverhood/modules/module1400_sprites.cpp @@ -71,6 +71,8 @@ uint32 AsScene1401Pipe::handleMessage(int messageNum, const MessageParam ¶m, case 0x483A: stSuckInProjector(); break; + default: + break; } return messageResult; } @@ -86,6 +88,8 @@ uint32 AsScene1401Pipe::hmSuckInProjector(int messageNum, const MessageParam &pa SetMessageHandler(&AsScene1401Pipe::handleMessage); SetUpdateHandler(&AsScene1401Pipe::update); break; + default: + break; } return messageResult; } @@ -132,6 +136,8 @@ uint32 AsScene1401Mouse::handleMessage(int messageNum, const MessageParam ¶m case 0x4839: stSuckedIn(); break; + default: + break; } return messageResult; } @@ -169,6 +175,8 @@ uint32 AsScene1401Cheese::handleMessage(int messageNum, const MessageParam ¶ case 0x4839: stSuckedIn(); break; + default: + break; } return messageResult; } @@ -230,6 +238,8 @@ uint32 AsScene1401BackDoor::handleMessage(int messageNum, const MessageParam &pa if (!_isOpen) stOpenDoor(); break; + default: + break; } return messageResult; } @@ -323,6 +333,8 @@ uint32 AsCommonProjector::handleMessage(int messageNum, const MessageParam ¶ case 0x4839: stStartSuckedIn(); break; + default: + break; } return messageResult; } @@ -366,6 +378,8 @@ uint32 AsCommonProjector::hmLockedInSlot(int messageNum, const MessageParam &par case NM_MOVE_TO_FRONT: sendMessage(_parentScene, NM_PRIORITY_CHANGE, 1010); break; + default: + break; } return messageResult; } @@ -376,6 +390,8 @@ uint32 AsCommonProjector::hmAnimation(int messageNum, const MessageParam ¶m, case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -562,6 +578,8 @@ uint32 AsScene1402PuzzleBox::handleMessage(int messageNum, const MessageParam &p case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -757,6 +775,8 @@ uint32 AsScene1407Mouse::handleMessage(int messageNum, const MessageParam ¶m } } break; + default: + break; } return messageResult; } @@ -861,6 +881,8 @@ uint32 AsScene1405Tile::handleMessage(int messageNum, const MessageParam ¶m, } messageResult = 1; break; + default: + break; } return messageResult; } @@ -945,6 +967,8 @@ uint32 KmScene1401::xHandleMessage(int messageNum, const MessageParam ¶m) { else GotoState(&Klaymen::stTurnToBack); break; + default: + break; } return 0; } @@ -986,6 +1010,8 @@ uint32 KmScene1402::xHandleMessage(int messageNum, const MessageParam ¶m) { case NM_KLAYMEN_RETURN_FROM_USE: GotoState(&Klaymen::stReturnFromUse); break; + default: + break; } return 0; } @@ -1047,6 +1073,8 @@ uint32 KmScene1403::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return 0; } @@ -1123,6 +1151,8 @@ uint32 KmScene1404::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module1500.cpp b/engines/neverhood/modules/module1500.cpp index 8e51b1aff5..d7e10c006f 100644 --- a/engines/neverhood/modules/module1500.cpp +++ b/engines/neverhood/modules/module1500.cpp @@ -55,6 +55,8 @@ void Module1500::createScene(int sceneNum, int which) { _vm->gameState().sceneNum = 3; _childObject = new Scene1501(_vm, this, 0x0CA04202, 0, 110, 48); break; + default: + break; } SetUpdateHandler(&Module1500::updateScene); _childObject->handleUpdate(); @@ -127,6 +129,8 @@ uint32 Scene1501::handleMessage(int messageNum, const MessageParam ¶m, Entit case NM_KEYPRESS_SPACE: _skip = true; break; + default: + break; } return messageResult; } diff --git a/engines/neverhood/modules/module1600.cpp b/engines/neverhood/modules/module1600.cpp index 0adcd939cd..9e07fb86c7 100644 --- a/engines/neverhood/modules/module1600.cpp +++ b/engines/neverhood/modules/module1600.cpp @@ -113,6 +113,8 @@ void Module1600::createScene(int sceneNum, int which) { else incGlobalVar(V_TALK_COUNTING_INDEX, +1); break; + default: + break; } SetUpdateHandler(&Module1600::updateScene); _childObject->handleUpdate(); @@ -181,6 +183,8 @@ void Module1600::updateScene() { case 1001: createScene(1, 0); break; + default: + break; } } } @@ -437,6 +441,8 @@ uint32 Scene1608::hmLowerFloor(int messageNum, const MessageParam ¶m, Entity } else if (sender == _asKey) setMessageList(0x004B46C8); break; + default: + break; } return 0; } @@ -457,6 +463,8 @@ uint32 Scene1608::hmUpperFloor(int messageNum, const MessageParam ¶m, Entity setMessageList(0x004B4760); } break; + default: + break; } return 0; } @@ -475,6 +483,8 @@ uint32 Scene1608::hmRidingCar(int messageNum, const MessageParam ¶m, Entity case 0x200D: sendMessage(_parentModule, 0x200D, 0); break; + default: + break; } return 0; } @@ -488,6 +498,8 @@ uint32 Scene1608::hmCarAtHome(int messageNum, const MessageParam ¶m, Entity case 0x200D: sendMessage(_parentModule, 0x200D, 0); break; + default: + break; } return 0; } @@ -569,6 +581,8 @@ uint32 Scene1609::handleMessage(int messageNum, const MessageParam ¶m, Entit _countdown1 = 1; } break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module1600_sprites.cpp b/engines/neverhood/modules/module1600_sprites.cpp index 6a4de86517..58caec5cfe 100644 --- a/engines/neverhood/modules/module1600_sprites.cpp +++ b/engines/neverhood/modules/module1600_sprites.cpp @@ -207,6 +207,8 @@ uint32 AsCommonCar::handleMessage(int messageNum, const MessageParam ¶m, Ent stCarAtHome(); _newDeltaXType = param.asInteger(); break; + default: + break; } return messageResult; } @@ -221,6 +223,8 @@ uint32 AsCommonCar::hmAnimation(int messageNum, const MessageParam ¶m, Entit case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -234,6 +238,8 @@ uint32 AsCommonCar::hmLeaveCar(int messageNum, const MessageParam ¶m, Entity sendMessage(_parentScene, NM_CAR_LEAVE, 0); SetMessageHandler(&AsCommonCar::handleMessage); break; + default: + break; } return 0; } @@ -930,6 +936,8 @@ uint32 KmScene1608::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return messageResult; } diff --git a/engines/neverhood/modules/module1700.cpp b/engines/neverhood/modules/module1700.cpp index 6ff34ecd91..45d89b166d 100644 --- a/engines/neverhood/modules/module1700.cpp +++ b/engines/neverhood/modules/module1700.cpp @@ -86,6 +86,8 @@ void Module1700::createScene(int sceneNum, int which) { _vm->_soundMan->startMusic(0x31114225, 0, 2); _childObject = new Scene1705(_vm, this, which); break; + default: + break; } SetUpdateHandler(&Module1700::updateScene); _childObject->handleUpdate(); @@ -123,6 +125,8 @@ void Module1700::updateScene() { case 4: leaveModule(1); break; + default: + break; } } } @@ -230,6 +234,8 @@ uint32 Scene1705::handleMessage(int messageNum, const MessageParam ¶m, Entit setMessageList(0x004B6AC0); } break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module1700_sprites.cpp b/engines/neverhood/modules/module1700_sprites.cpp index 3a6784b0f5..7a7145799e 100644 --- a/engines/neverhood/modules/module1700_sprites.cpp +++ b/engines/neverhood/modules/module1700_sprites.cpp @@ -61,6 +61,8 @@ uint32 SsScene1705Tape::handleMessage(int messageNum, const MessageParam ¶m, setVisible(false); SetMessageHandler(NULL); break; + default: + break; } return messageResult; } @@ -149,6 +151,8 @@ uint32 KmScene1705::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x483E: teleporterDisappear(0xD86E4477); break; + default: + break; } return messageResult; } diff --git a/engines/neverhood/modules/module1800.cpp b/engines/neverhood/modules/module1800.cpp index 17d6367252..4d61cb43ea 100644 --- a/engines/neverhood/modules/module1800.cpp +++ b/engines/neverhood/modules/module1800.cpp @@ -108,6 +108,8 @@ void Module1800::createScene(int sceneNum, int which) { // NOTE: Newly introduced sceneNum 1009 (was duplicate 3 with own update handler) createSmackerScene(0x0A840C01, true, true, false); break; + default: + break; } SetUpdateHandler(&Module1800::updateScene); _childObject->handleUpdate(); @@ -168,6 +170,8 @@ void Module1800::updateScene() { case 1009: leaveModule(0); break; + default: + break; } } else { switch (_sceneNum) { @@ -175,6 +179,8 @@ void Module1800::updateScene() { if (navigationScene()->isWalkingForward() && navigationScene()->getNavigationIndex() == 2) _vm->_soundMan->setTwoSoundsPlayFlag(false); break; + default: + break; } } } diff --git a/engines/neverhood/modules/module1900.cpp b/engines/neverhood/modules/module1900.cpp index 71926d6950..d055a5dafd 100644 --- a/engines/neverhood/modules/module1900.cpp +++ b/engines/neverhood/modules/module1900.cpp @@ -63,6 +63,8 @@ void Module1900::createScene(int sceneNum, int which) { _vm->gameState().sceneNum = 6; _childObject = new Scene1907(_vm, this); break; + default: + break; } SetUpdateHandler(&Module1900::updateScene); _childObject->handleUpdate(); @@ -80,6 +82,8 @@ void Module1900::updateScene() { case 6: createScene(0, 1); break; + default: + break; } } } @@ -228,6 +232,8 @@ uint32 Scene1907::handleMessage(int messageNum, const MessageParam ¶m, Entit playSound(3); setGlobalVar(V_STAIRS_PUZZLE_SOLVED, 1); break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module1900_sprites.cpp b/engines/neverhood/modules/module1900_sprites.cpp index 074a83cdcd..28e8164a36 100644 --- a/engines/neverhood/modules/module1900_sprites.cpp +++ b/engines/neverhood/modules/module1900_sprites.cpp @@ -115,6 +115,8 @@ uint32 AsScene1907Symbol::handleMessage(int messageNum, const MessageParam ¶ } else messageResult = 0; break; + default: + break; } return messageResult; } @@ -125,6 +127,8 @@ uint32 AsScene1907Symbol::hmTryToPlugIn(int messageNum, const MessageParam ¶ case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -355,6 +359,9 @@ uint32 SsScene1907UpDownButton::handleMessage(int messageNum, const MessageParam playSound(0); } messageResult = 1; + break; + default: + break; } return messageResult; } @@ -397,6 +404,8 @@ uint32 AsScene1907WaterHint::hmShowing(int messageNum, const MessageParam ¶m case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -449,6 +458,8 @@ uint32 KmScene1901::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module2000.cpp b/engines/neverhood/modules/module2000.cpp index 498f50989e..a41194f1f4 100644 --- a/engines/neverhood/modules/module2000.cpp +++ b/engines/neverhood/modules/module2000.cpp @@ -59,6 +59,8 @@ void Module2000::createScene(int sceneNum, int which) { setSubVar(V_TELEPORTER_DEST_AVAILABLE, 1, 1); createSmackerScene(0x204B2031, true, true, false); break; + default: + break; } SetUpdateHandler(&Module2000::updateScene); _childObject->handleUpdate(); @@ -87,6 +89,8 @@ void Module2000::updateScene() { case 2: createScene(1, 0); break; + default: + break; } } } @@ -152,6 +156,9 @@ uint32 Scene2001::handleMessage(int messageNum, const MessageParam ¶m, Entit setRectList(0x004B3670); _klaymen->setKlaymenIdleTable1(); } + break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module2000_sprites.cpp b/engines/neverhood/modules/module2000_sprites.cpp index ccf383d26d..ada95e0661 100644 --- a/engines/neverhood/modules/module2000_sprites.cpp +++ b/engines/neverhood/modules/module2000_sprites.cpp @@ -85,6 +85,8 @@ uint32 KmScene2001::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x483E: teleporterDisappear(0x18AB4ED4); break; + default: + break; } return messageResult; } diff --git a/engines/neverhood/modules/module2100.cpp b/engines/neverhood/modules/module2100.cpp index 9488057fa4..87e4f8345d 100644 --- a/engines/neverhood/modules/module2100.cpp +++ b/engines/neverhood/modules/module2100.cpp @@ -55,6 +55,8 @@ void Module2100::createScene(int sceneNum, int which) { _vm->_soundMan->startMusic(0x11482B95, 0, 1); _childObject = new Scene2101(_vm, this, which); break; + default: + break; } SetUpdateHandler(&Module2100::updateScene); _childObject->handleUpdate(); @@ -67,8 +69,11 @@ void Module2100::updateScene() { if (_moduleResult == 1) { setGlobalVar(V_DOOR_PASSED, 1); leaveModule(0); - } else + } else { leaveModule(1); + } + break; + default: break; } } @@ -210,6 +215,8 @@ uint32 Scene2101::handleMessage(int messageNum, const MessageParam ¶m, Entit setMessageList2(0x004B8F00); } break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module2100_sprites.cpp b/engines/neverhood/modules/module2100_sprites.cpp index 4d2e4956e6..e4df003e20 100644 --- a/engines/neverhood/modules/module2100_sprites.cpp +++ b/engines/neverhood/modules/module2100_sprites.cpp @@ -51,6 +51,8 @@ uint32 AsScene2101Door::handleMessage(int messageNum, const MessageParam ¶m, case NM_KLAYMEN_CLOSE_DOOR: stCloseDoor(); break; + default: + break; } return messageResult; } @@ -97,6 +99,8 @@ uint32 AsScene2101HitByDoorEffect::handleMessage(int messageNum, const MessagePa stopAnimation(); setVisible(false); break; + default: + break; } return messageResult; } @@ -137,6 +141,8 @@ uint32 SsCommonFloorButton::handleMessage(int messageNum, const MessageParam &pa _countdown = 16; playSound(0, _soundFileHash); break; + default: + break; } return messageResult; } @@ -220,6 +226,8 @@ uint32 KmScene2101::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x483E: teleporterDisappear(0x9A28CA1C); break; + default: + break; } return messageResult; } @@ -243,6 +251,8 @@ uint32 KmScene2101::hmHitByDoor(int messageNum, const MessageParam ¶m, Entit playSound(0, 0x40608A59); } break; + default: + break; } return messageResult; } diff --git a/engines/neverhood/modules/module2200.cpp b/engines/neverhood/modules/module2200.cpp index 6618cb3ab0..16c5d15151 100644 --- a/engines/neverhood/modules/module2200.cpp +++ b/engines/neverhood/modules/module2200.cpp @@ -273,6 +273,8 @@ void Module2200::createScene(int sceneNum, int which) { createStaticScene(0x08C74886, 0x74882084); } break; + default: + break; } SetUpdateHandler(&Module2200::updateScene); _childObject->handleUpdate(); @@ -450,6 +452,8 @@ void Module2200::updateScene() { case 47: createScene(41, 1); break; + default: + break; } } } @@ -583,6 +587,8 @@ uint32 Scene2201::handleMessage(int messageNum, const MessageParam ¶m, Entit setMessageList(0x004B81C8); } break; + default: + break; } return 0; } @@ -680,6 +686,8 @@ uint32 Scene2202::handleMessage(int messageNum, const MessageParam ¶m, Entit else _surfacePriority = 500; break; + default: + break; } return 0; } @@ -816,6 +824,8 @@ uint32 Scene2203::handleMessage(int messageNum, const MessageParam ¶m, Entit setMessageList(0x004B83F0); } break; + default: + break; } return messageResult; } @@ -922,6 +932,8 @@ uint32 Scene2205::handleMessage(int messageNum, const MessageParam ¶m, Entit case 0x480B: setGlobalVar(V_LIGHTS_ON, getGlobalVar(V_LIGHTS_ON) ? 0 : 1); break; + default: + break; } return 0; } @@ -1046,6 +1058,8 @@ uint32 Scene2206::handleMessage(int messageNum, const MessageParam ¶m, Entit case NM_MOVE_TO_FRONT: klaymenInFrontSpikes(); break; + default: + break; } return messageResult; } @@ -1255,6 +1269,8 @@ uint32 Scene2207::handleMessage(int messageNum, const MessageParam ¶m, Entit sendMessage(_klaymen, 0x2001, 0); } break; + default: + break; } return messageResult; } @@ -1272,6 +1288,8 @@ uint32 Scene2207::handleMessage2(int messageNum, const MessageParam ¶m, Enti setMessageList(0x004B3920); setRectList(0x004B3948); break; + default: + break; } return messageResult; } @@ -1404,6 +1422,8 @@ uint32 Scene2208::handleMessage(int messageNum, const MessageParam ¶m, Entit if (param.asPoint().x <= 40 || param.asPoint().x >= 600) leaveScene(0); break; + default: + break; } return messageResult; } @@ -1529,6 +1549,8 @@ uint32 Scene2242::handleMessage(int messageNum, const MessageParam ¶m, Entit setMessageList(0x004B3D50); } break; + default: + break; } return messageResult; } @@ -1624,6 +1646,8 @@ uint32 HallOfRecordsScene::handleMessage(int messageNum, const MessageParam &par if (param.asInteger() == 0x800C6694) readClickedColumn(); break; + default: + break; } return messageResult; } @@ -1712,6 +1736,8 @@ uint32 Scene2247::handleMessage(int messageNum, const MessageParam ¶m, Entit if (param.asInteger() == 0x800C6694) readClickedColumn(); break; + default: + break; } return messageResult; } diff --git a/engines/neverhood/modules/module2200_sprites.cpp b/engines/neverhood/modules/module2200_sprites.cpp index 7c1e84c3cf..e04154063c 100644 --- a/engines/neverhood/modules/module2200_sprites.cpp +++ b/engines/neverhood/modules/module2200_sprites.cpp @@ -84,6 +84,8 @@ uint32 AsScene2201Door::handleMessage(int messageNum, const MessageParam ¶m, if (!_isOpen) stOpenDoor(); break; + default: + break; } return messageResult; } @@ -166,6 +168,8 @@ uint32 SsScene2202PuzzleCube::handleMessage(int messageNum, const MessageParam & _isMoving = true; moveCube(param.asInteger()); break; + default: + break; } return messageResult; } @@ -347,6 +351,9 @@ uint32 AsCommonKey::handleMessage(int messageNum, const MessageParam ¶m, Ent setSubVar(VA_HAS_KEY, _keyIndex, 1); setVisible(false); SetMessageHandler(NULL); + break; + default: + break; } return messageResult; } @@ -399,6 +406,8 @@ uint32 AsScene2203Door::handleMessage(int messageNum, const MessageParam ¶m, closeDoor(); sendMessage(_parentScene, 0x2003, 0); break; + default: + break; } return messageResult; } @@ -428,6 +437,8 @@ uint32 SsScene2205DoorFrame::handleMessage(int messageNum, const MessageParam &p case NM_ANIMATION_UPDATE: loadSprite(getGlobalVar(V_LIGHTS_ON) ? 0x24306227 : 0xD90032A0, kSLFDefDrawOffset | kSLFDefPosition); break; + default: + break; } return messageResult; } @@ -470,6 +481,8 @@ uint32 AsScene2206DoorSpikes::handleMessage(int messageNum, const MessageParam & SetMessageHandler(NULL); SetSpriteUpdate(&AsScene2206DoorSpikes::suClose); break; + default: + break; } return messageResult; } @@ -515,6 +528,8 @@ uint32 AsScene2206Platform::handleMessage(int messageNum, const MessageParam &pa SetMessageHandler(NULL); SetSpriteUpdate(&AsScene2206Platform::suMoveDown); break; + default: + break; } return messageResult; } @@ -548,6 +563,8 @@ uint32 SsScene2206TestTube::handleMessage(int messageNum, const MessageParam &pa setVisible(false); SetMessageHandler(NULL); break; + default: + break; } return messageResult; } @@ -632,6 +649,8 @@ uint32 AsScene2207Elevator::handleMessage(int messageNum, const MessageParam &pa case NM_ANIMATION_UPDATE: moveToY(param.asInteger()); break; + default: + break; } return messageResult; } @@ -701,6 +720,8 @@ uint32 AsScene2207Lever::handleMessage(int messageNum, const MessageParam ¶m case NM_MOVE_TO_FRONT: sendMessage(_parentScene, NM_PRIORITY_CHANGE, 1010); break; + default: + break; } return messageResult; } @@ -778,6 +799,8 @@ uint32 AsScene2207WallRobotAnimation::handleMessage(int messageNum, const Messag case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -831,6 +854,8 @@ uint32 AsScene2207WallCannonAnimation::handleMessage(int messageNum, const Messa case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -927,6 +952,8 @@ uint32 KmScene2201::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return 0; } @@ -997,6 +1024,8 @@ uint32 KmScene2203::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return 0; } @@ -1020,6 +1049,8 @@ uint32 KmScene2203::hmClayDoorOpen(int messageNum, const MessageParam ¶m, En sendMessage(_attachedSprite, NM_KLAYMEN_OPEN_DOOR, 0); } break; + default: + break; } return messageResult; } @@ -1067,6 +1098,8 @@ uint32 KmScene2205::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return 0; } @@ -1166,6 +1199,8 @@ uint32 KmScene2206::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return 0; } @@ -1250,6 +1285,8 @@ uint32 KmScene2207::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return 0; } @@ -1317,6 +1354,8 @@ uint32 KmScene2242::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4837: stopWalking(); break; + default: + break; } return 0; } @@ -1369,6 +1408,8 @@ uint32 KmHallOfRecords::xHandleMessage(int messageNum, const MessageParam ¶m case 0x4837: stopWalking(); break; + default: + break; } return 0; } @@ -1422,6 +1463,8 @@ uint32 KmScene2247::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4837: stopWalking(); break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module2300.cpp b/engines/neverhood/modules/module2300.cpp index 68ae07f2bb..b6aff90f86 100644 --- a/engines/neverhood/modules/module2300.cpp +++ b/engines/neverhood/modules/module2300.cpp @@ -108,6 +108,8 @@ void Module2300::createScene(int sceneNum, int which) { case 9999: createDemoScene(); break; + default: + break; } SetUpdateHandler(&Module2300::updateScene); _childObject->handleUpdate(); @@ -157,6 +159,8 @@ void Module2300::updateScene() { case 9999: createScene(1, -1); break; + default: + break; } } else { switch (_sceneNum) { @@ -179,6 +183,8 @@ void Module2300::updateScene() { _vm->_soundMan->setSoundVolume(0x90F0D1C3, _waterfallSoundVolume); } break; + default: + break; } } } diff --git a/engines/neverhood/modules/module2400.cpp b/engines/neverhood/modules/module2400.cpp index 4bfc10abbf..98356a5e0e 100644 --- a/engines/neverhood/modules/module2400.cpp +++ b/engines/neverhood/modules/module2400.cpp @@ -92,6 +92,8 @@ void Module2400::createScene(int sceneNum, int which) { _vm->gameState().sceneNum = 9; createStaticScene(0x8C020505, 0x205018C8); break; + default: + break; } SetUpdateHandler(&Module2400::updateScene); _childObject->handleUpdate(); @@ -147,6 +149,8 @@ void Module2400::updateScene() { case 9: createScene(2, 1); break; + default: + break; } } } @@ -341,6 +345,8 @@ uint32 Scene2401::handleMessage(int messageNum, const MessageParam ¶m, Entit _palette->addBasePalette(0x91D3A391, 0, 65, 0); _palette->startFadeToPalette(12); break; + default: + break; } return messageResult; } @@ -448,6 +454,8 @@ uint32 Scene2402::handleMessage(int messageNum, const MessageParam ¶m, Entit setMessageList(0x004AF890); } break; + default: + break; } return messageResult; } @@ -546,6 +554,8 @@ uint32 Scene2403::handleMessage(int messageNum, const MessageParam ¶m, Entit setMessageList(0x004B5D98); } break; + default: + break; } return messageResult; } @@ -657,6 +667,8 @@ uint32 Scene2406::handleMessage(int messageNum, const MessageParam ¶m, Entit setMessageList(0x004B77D8); } break; + default: + break; } return messageResult; } diff --git a/engines/neverhood/modules/module2400_sprites.cpp b/engines/neverhood/modules/module2400_sprites.cpp index f31fd59907..4198287e27 100644 --- a/engines/neverhood/modules/module2400_sprites.cpp +++ b/engines/neverhood/modules/module2400_sprites.cpp @@ -65,6 +65,8 @@ uint32 AsScene2401WaterSpit::handleMessage(int messageNum, const MessageParam &p stopAnimation(); setVisible(false); break; + default: + break; } return messageResult; } @@ -108,6 +110,8 @@ uint32 AsScene2401FlowingWater::handleMessage(int messageNum, const MessageParam stopAnimation(); setVisible(false); break; + default: + break; } return messageResult; } @@ -151,6 +155,8 @@ uint32 AsScene2401WaterFlushing::handleMessage(int messageNum, const MessagePara stopAnimation(); setVisible(false); break; + default: + break; } return messageResult; } @@ -207,6 +213,8 @@ uint32 AsScene2401Door::handleMessage(int messageNum, const MessageParam ¶m, NextState(&AsScene2401Door::stDoorOpenFinished); } break; + default: + break; } return messageResult; } @@ -265,6 +273,8 @@ uint32 AsScene2402Door::handleMessage(int messageNum, const MessageParam ¶m, _newStickFrameIndex = STICK_LAST_FRAME; playSound(0, calcHash("fxDoorOpen38")); break; + default: + break; } return messageResult; } @@ -349,6 +359,8 @@ uint32 AsScene2402TV::hmJoke(int messageNum, const MessageParam ¶m, Entity * case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -430,6 +442,8 @@ uint32 KmScene2401::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return messageResult; } @@ -450,6 +464,8 @@ uint32 KmScene2401::hmSpit(int messageNum, const MessageParam ¶m, Entity *se sendMessage(_parentScene, 0x2001, _spitDestPipeIndex); } break; + default: + break; } return messageResult; } @@ -560,6 +576,8 @@ uint32 KmScene2402::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return messageResult; } @@ -644,6 +662,8 @@ uint32 KmScene2403::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return messageResult; } @@ -734,6 +754,8 @@ uint32 KmScene2406::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return messageResult; } diff --git a/engines/neverhood/modules/module2500.cpp b/engines/neverhood/modules/module2500.cpp index 7e93b0ebc0..90207a17cb 100644 --- a/engines/neverhood/modules/module2500.cpp +++ b/engines/neverhood/modules/module2500.cpp @@ -136,6 +136,8 @@ void Module2500::createScene(int sceneNum, int which) { else createStaticScene(0x7A343546, 0x435427AB); break; + default: + break; } SetUpdateHandler(&Module2500::updateScene); _childObject->handleUpdate(); @@ -200,6 +202,8 @@ void Module2500::updateScene() { case 9: createScene(8, 2); break; + default: + break; } } } @@ -213,6 +217,8 @@ uint32 Module2500::handleMessage(int messageNum, const MessageParam ¶m, Enti if (_soundIndex >= 4) _soundIndex = 0; break; + default: + break; } return messageResult; } @@ -392,6 +398,8 @@ uint32 Scene2501::handleMessage(int messageNum, const MessageParam ¶m, Entit case 0x200D: sendMessage(_parentModule, 0x200D, 0); break; + default: + break; } return messageResult; } @@ -422,6 +430,8 @@ uint32 Scene2501::hmRidingCar(int messageNum, const MessageParam ¶m, Entity case 0x200D: sendMessage(_parentModule, 0x200D, 0); break; + default: + break; } return messageResult; } @@ -435,6 +445,8 @@ uint32 Scene2501::hmCarAtHome(int messageNum, const MessageParam ¶m, Entity case 0x200D: sendMessage(_parentModule, 0x200D, 0); break; + default: + break; } return messageResult; } @@ -495,6 +507,8 @@ uint32 Scene2504::handleMessage(int messageNum, const MessageParam ¶m, Entit if (param.asPoint().x <= 20 || param.asPoint().x >= 620) leaveScene(0); break; + default: + break; } return messageResult; } diff --git a/engines/neverhood/modules/module2500_sprites.cpp b/engines/neverhood/modules/module2500_sprites.cpp index b628cd8f02..9dc5f5ab1e 100644 --- a/engines/neverhood/modules/module2500_sprites.cpp +++ b/engines/neverhood/modules/module2500_sprites.cpp @@ -68,6 +68,8 @@ uint32 SsScene2504Button::handleMessage(int messageNum, const MessageParam ¶ } messageResult = 1; break; + default: + break; } return messageResult; } @@ -120,6 +122,8 @@ uint32 KmScene2501::xHandleMessage(int messageNum, const MessageParam ¶m) { _isSittingInTeleporter = false; GotoState(&Klaymen::stGetUpFromTeleporter); break; + default: + break; } return messageResult; } diff --git a/engines/neverhood/modules/module2600.cpp b/engines/neverhood/modules/module2600.cpp index d0f6090ea8..ff4ed24f63 100644 --- a/engines/neverhood/modules/module2600.cpp +++ b/engines/neverhood/modules/module2600.cpp @@ -128,6 +128,8 @@ void Module2600::createScene(int sceneNum, int which) { case 9999: createDemoScene(); break; + default: + break; } SetUpdateHandler(&Module2600::updateScene); _childObject->handleUpdate(); @@ -216,6 +218,8 @@ void Module2600::updateScene() { case 9999: createScene(_vm->gameState().sceneNum, -1); break; + default: + break; } } } @@ -254,6 +258,8 @@ uint32 Scene2609::handleMessage(int messageNum, const MessageParam ¶m, Entit _isBusy = false; sendMessage(_asWater, NM_POSITION_CHANGE, 0); break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module2600_sprites.cpp b/engines/neverhood/modules/module2600_sprites.cpp index ffba6a4e59..fa14332a8c 100644 --- a/engines/neverhood/modules/module2600_sprites.cpp +++ b/engines/neverhood/modules/module2600_sprites.cpp @@ -72,6 +72,8 @@ uint32 SsScene2609Button::handleMessage(int messageNum, const MessageParam ¶ } messageResult = 1; break; + default: + break; } return messageResult; } @@ -108,6 +110,8 @@ uint32 AsScene2609Water::handleMessage(int messageNum, const MessageParam ¶m setVisible(true); _vm->_soundMan->playSoundLooping(0xDC2769B0); break; + default: + break; } return messageResult; } diff --git a/engines/neverhood/modules/module2700.cpp b/engines/neverhood/modules/module2700.cpp index e0c6509793..702552e2ea 100644 --- a/engines/neverhood/modules/module2700.cpp +++ b/engines/neverhood/modules/module2700.cpp @@ -322,6 +322,8 @@ void Module2700::createScene(int sceneNum, int which) { _vm->gameState().sceneNum = 31; _childObject = new Scene2732(_vm, this); break; + default: + break; } SetUpdateHandler(&Module2700::updateScene); _childObject->handleUpdate(); @@ -498,6 +500,8 @@ void Module2700::updateScene() { case 31: createScene(28, 1); break; + default: + break; } } else { switch (_sceneNum) { @@ -513,6 +517,8 @@ void Module2700::updateScene() { _radioMusicInitialized = true; } break; + default: + break; } } } @@ -526,6 +532,8 @@ uint32 Module2700::handleMessage(int messageNum, const MessageParam ¶m, Enti if (_soundIndex >= 4) _soundIndex = 0; break; + default: + break; } return messageResult; } @@ -616,6 +624,8 @@ uint32 Scene2701::hmRidingCar(int messageNum, const MessageParam ¶m, Entity case 0x200D: sendMessage(_parentModule, 0x200D, 0); break; + default: + break; } return 0; } @@ -634,6 +644,8 @@ uint32 Scene2701::hmCarAtHome(int messageNum, const MessageParam ¶m, Entity case 0x200D: sendMessage(_parentModule, 0x200D, 0); break; + default: + break; } return 0; } @@ -752,6 +764,8 @@ uint32 Scene2702::handleMessage(int messageNum, const MessageParam ¶m, Entit case 0x200D: sendMessage(_parentModule, 0x200D, 0); break; + default: + break; } return 0; } @@ -903,6 +917,8 @@ uint32 Scene2703::handleMessage(int messageNum, const MessageParam ¶m, Entit case 0x200D: sendMessage(_parentModule, 0x200D, 0); break; + default: + break; } return 0; } @@ -1002,6 +1018,8 @@ uint32 Scene2704::handleMessage(int messageNum, const MessageParam ¶m, Entit case 0x200D: sendMessage(_parentModule, 0x200D, 0); break; + default: + break; } return 0; } @@ -1083,6 +1101,8 @@ uint32 Scene2706::handleMessage(int messageNum, const MessageParam ¶m, Entit case 0x200D: sendMessage(_parentModule, 0x200D, 0); break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module2700_sprites.cpp b/engines/neverhood/modules/module2700_sprites.cpp index 079e0b7afe..7bfe7e53e3 100644 --- a/engines/neverhood/modules/module2700_sprites.cpp +++ b/engines/neverhood/modules/module2700_sprites.cpp @@ -115,6 +115,8 @@ uint32 KmScene2732::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x483C: GotoState(&Klaymen::stPeekInsideReturn); break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module2800.cpp b/engines/neverhood/modules/module2800.cpp index 24dd7da195..ca5b481abd 100644 --- a/engines/neverhood/modules/module2800.cpp +++ b/engines/neverhood/modules/module2800.cpp @@ -182,6 +182,8 @@ void Module2800::createScene(int sceneNum, int which) { _currentMusicFileHash = 0; createSmackerScene(0x00800801, true, true, false); break; + default: + break; } SetUpdateHandler(&Module2800::updateScene); _childObject->handleUpdate(); @@ -314,6 +316,8 @@ void Module2800::updateScene() { case 1001: createScene(1, -1); break; + default: + break; } } else { switch (_sceneNum) { @@ -323,6 +327,8 @@ void Module2800::updateScene() { case 1: updateMusic(false); break; + default: + break; } } } @@ -458,6 +464,8 @@ uint32 Scene2801::handleMessage(int messageNum, const MessageParam ¶m, Entit _palette->addBasePalette(_paletteHash, 0, 65, 0); _palette->startFadeToPalette(12); break; + default: + break; } return messageResult; } @@ -538,7 +546,8 @@ void Scene2802::update() { } else _currTuneStatus = 0; break; - + default: + break; } if (prevRadioMusicIndex != _currRadioMusicIndex) @@ -590,6 +599,8 @@ uint32 Scene2802::handleMessage(int messageNum, const MessageParam ¶m, Entit if (prevTuneStatus != _currTuneStatus) changeTuneStatus(prevTuneStatus, _currTuneStatus); break; + default: + break; } return 0; } @@ -777,6 +788,8 @@ uint32 Scene2803::handleMessage(int messageNum, const MessageParam ¶m, Entit klaymenFloor(); setPaletteArea0(); break; + default: + break; } return messageResult; } @@ -1034,6 +1047,8 @@ uint32 Scene2803Small::handleMessage(int messageNum, const MessageParam ¶m, setSurfacePriority(_sprite5->getSurface(), 900); sendMessage(_klaymen, 0x482C, 0x2086222D); break; + default: + break; } return 0; } @@ -1200,6 +1215,8 @@ uint32 Scene2804::handleMessage(int messageNum, const MessageParam ¶m, Entit _isSolved = false; _countdown2 = 48; break; + default: + break; } return 0; } @@ -1298,6 +1315,8 @@ uint32 Scene2805::handleMessage(int messageNum, const MessageParam ¶m, Entit _klaymen->setKlaymenIdleTable1(); } break; + default: + break; } return 0; } @@ -1387,6 +1406,8 @@ uint32 Scene2806::handleMessage(int messageNum, const MessageParam ¶m, Entit case NM_ANIMATION_UPDATE: sendMessage(_asSpew, 0x2000, 0); break; + default: + break; } return 0; } @@ -1464,6 +1485,8 @@ uint32 Scene2807::handleMessage(int messageNum, const MessageParam ¶m, Entit leaveScene(0); } break; + default: + break; } return 0; } @@ -1540,6 +1563,8 @@ uint32 Scene2808::handleMessage(int messageNum, const MessageParam ¶m, Entit leaveScene(1); } break; + default: + break; } return 0; } @@ -1662,6 +1687,8 @@ uint32 Scene2809::handleMessage(int messageNum, const MessageParam ¶m, Entit case NM_ANIMATION_UPDATE: sendMessage(_asSpew, 0x2000, 0); break; + default: + break; } return 0; } @@ -1908,6 +1935,8 @@ uint32 Scene2810::handleMessage(int messageNum, const MessageParam ¶m, Entit setMessageList(0x004AE750); } break; + default: + break; } return messageResult; } @@ -2031,6 +2060,8 @@ uint32 Scene2812::handleMessage(int messageNum, const MessageParam ¶m, Entit _sprite1->setVisible(false); _klaymen->setClipRect(_sprite4->getDrawRect().x, 0, 640, _sprite3->getDrawRect().y2()); break; + default: + break; } return messageResult; } @@ -2135,6 +2166,8 @@ uint32 Scene2822::handleMessage(int messageNum, const MessageParam ¶m, Entit } } break; + default: + break; } return messageResult; } diff --git a/engines/neverhood/modules/module2800_sprites.cpp b/engines/neverhood/modules/module2800_sprites.cpp index ad814d2b5b..72cb101c80 100644 --- a/engines/neverhood/modules/module2800_sprites.cpp +++ b/engines/neverhood/modules/module2800_sprites.cpp @@ -55,6 +55,8 @@ uint32 AsScene2803LightCord::handleMessage(int messageNum, const MessageParam &p case NM_MOVE_TO_FRONT: sendMessage(_parentScene, NM_PRIORITY_CHANGE, 1010); break; + default: + break; } return messageResult; } @@ -65,6 +67,8 @@ uint32 AsScene2803LightCord::hmPulled(int messageNum, const MessageParam ¶m, case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -113,6 +117,8 @@ uint32 AsScene2803TestTubeOne::handleMessage(int messageNum, const MessageParam else startAnimation(_fileHash1, 0, -1); break; + default: + break; } return messageResult; } @@ -143,6 +149,8 @@ uint32 AsScene2803Rope::handleMessage(int messageNum, const MessageParam ¶m, case NM_MOVE_TO_FRONT: sendMessage(_parentScene, NM_PRIORITY_CHANGE, 1010); break; + default: + break; } return messageResult; } @@ -159,6 +167,8 @@ uint32 AsScene2803Rope::hmReleased(int messageNum, const MessageParam ¶m, En case NM_MOVE_TO_FRONT: sendMessage(_parentScene, NM_PRIORITY_CHANGE, 1010); break; + default: + break; } return messageResult; } @@ -202,6 +212,8 @@ uint32 SsScene2804RedButton::handleMessage(int messageNum, const MessageParam &p } messageResult = 1; break; + default: + break; } return messageResult; } @@ -227,6 +239,8 @@ uint32 SsScene2804LightCoil::handleMessage(int messageNum, const MessageParam &p updatePosition(); messageResult = 1; break; + default: + break; } return messageResult; } @@ -252,6 +266,8 @@ uint32 SsScene2804LightTarget::handleMessage(int messageNum, const MessageParam updatePosition(); messageResult = 1; break; + default: + break; } return messageResult; } @@ -436,6 +452,8 @@ uint32 SsScene2804CrystalButton::handleMessage(int messageNum, const MessagePara } messageResult = 1; break; + default: + break; } return messageResult; } @@ -479,6 +497,8 @@ uint32 AsScene2804BeamCoil::handleMessage(int messageNum, const MessageParam &pa hide(); messageResult = 1; break; + default: + break; } return messageResult; } @@ -512,6 +532,8 @@ uint32 AsScene2804BeamCoil::hmBeaming(int messageNum, const MessageParam ¶m, case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -542,6 +564,8 @@ uint32 AsScene2804BeamTarget::handleMessage(int messageNum, const MessageParam & stopAnimation(); messageResult = 1; break; + default: + break; } return messageResult; } @@ -570,6 +594,8 @@ uint32 AsScene2806Spew::handleMessage(int messageNum, const MessageParam ¶m, stopAnimation(); setVisible(false); break; + default: + break; } return messageResult; } @@ -635,6 +661,8 @@ uint32 SsScene2808Dispenser::handleMessage(int messageNum, const MessageParam &p sendMessage(_parentScene, 0x2000, _testTubeIndex); messageResult = 1; break; + default: + break; } return messageResult; } @@ -694,6 +722,8 @@ uint32 AsScene2808TestTube::handleMessage(int messageNum, const MessageParam &pa fill(); messageResult = 1; break; + default: + break; } return messageResult; } @@ -757,6 +787,8 @@ uint32 AsScene2808Handle::handleMessage(int messageNum, const MessageParam ¶ } messageResult = 1; break; + default: + break; } return messageResult; } @@ -767,6 +799,8 @@ uint32 AsScene2808Handle::hmActivating(int messageNum, const MessageParam ¶m case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -810,6 +844,8 @@ uint32 AsScene2808Flow::hmFlowing(int messageNum, const MessageParam ¶m, Ent case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -874,6 +910,8 @@ uint32 AsScene2809Spew::handleMessage(int messageNum, const MessageParam ¶m, stopAnimation(); setVisible(false); break; + default: + break; } return messageResult; } @@ -902,6 +940,8 @@ uint32 AsScene2810Rope::handleMessage(int messageNum, const MessageParam ¶m, case NM_MOVE_TO_FRONT: sendMessage(_parentScene, NM_PRIORITY_CHANGE, 1010); break; + default: + break; } return messageResult; } @@ -933,6 +973,8 @@ uint32 AsScene2812Winch::handleMessage(int messageNum, const MessageParam ¶m case NM_ANIMATION_STOP: startAnimation(0x20DA08A0, 7, -1); break; + default: + break; } return messageResult; } @@ -962,6 +1004,8 @@ uint32 AsScene2812Rope::handleMessage(int messageNum, const MessageParam ¶m, case NM_MOVE_TO_FRONT: sendMessage(_parentScene, NM_PRIORITY_CHANGE, 1010); break; + default: + break; } return messageResult; } @@ -972,6 +1016,8 @@ uint32 AsScene2812Rope::hmRopingDown(int messageNum, const MessageParam ¶m, case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -997,6 +1043,8 @@ uint32 AsScene2812TrapDoor::handleMessage(int messageNum, const MessageParam &pa playSound(0, 0xEA005F40); _newStickFrameIndex = STICK_LAST_FRAME; break; + default: + break; } return messageResult; } @@ -1066,6 +1114,8 @@ uint32 KmScene2801::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4837: stopWalking(); break; + default: + break; } return 0; } @@ -1128,6 +1178,8 @@ uint32 KmScene2803::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4838: GotoState(&Klaymen::stJumpToGrabRelease); break; + default: + break; } return 0; } @@ -1181,6 +1233,8 @@ uint32 KmScene2803Small::xHandleMessage(int messageNum, const MessageParam ¶ case 0x4830: GotoState(&KmScene2803Small::stShrink); break; + default: + break; } return 0; } @@ -1194,6 +1248,8 @@ uint32 KmScene2803Small::hmShrink(int messageNum, const MessageParam ¶m, Ent else if (param.asInteger() == 0x33288344) playSound(2, 0x10688664); break; + default: + break; } return messageResult; } @@ -1262,6 +1318,8 @@ uint32 KmScene2805::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x483E: teleporterDisappear(0xD82A4094); break; + default: + break; } return messageResult; } @@ -1320,6 +1378,8 @@ uint32 KmScene2806::xHandleMessage(int messageNum, const MessageParam ¶m) { else GotoState(&Klaymen::stUseTube); break; + default: + break; } return 0; } @@ -1378,6 +1438,8 @@ uint32 KmScene2809::xHandleMessage(int messageNum, const MessageParam ¶m) { else GotoState(&Klaymen::stUseTube); break; + default: + break; } return 0; } @@ -1427,6 +1489,8 @@ uint32 KmScene2810Small::xHandleMessage(int messageNum, const MessageParam ¶ case 0x4837: stopWalking(); break; + default: + break; } return 0; } @@ -1519,6 +1583,8 @@ uint32 KmScene2810::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4837: stopWalking(); break; + default: + break; } return 0; } @@ -1609,6 +1675,8 @@ uint32 KmScene2812::xHandleMessage(int messageNum, const MessageParam ¶m) { case 0x4840: startSpecialWalkLeft(param.asInteger()); break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module2900.cpp b/engines/neverhood/modules/module2900.cpp index 69186514a2..22b4f765fb 100644 --- a/engines/neverhood/modules/module2900.cpp +++ b/engines/neverhood/modules/module2900.cpp @@ -74,6 +74,8 @@ void Module2900::createScene(int sceneNum, int which) { _vm->gameState().sceneNum = 0; _childObject = new Scene2001(_vm, this, which); break; + default: + break; } SetUpdateHandler(&Module2900::updateScene); _childObject->handleUpdate(); @@ -120,6 +122,8 @@ void Module2900::updateScene() { case 6: leaveModule(_teleporterModuleResult); break; + default: + break; } } } @@ -228,6 +232,8 @@ uint32 Scene2901::handleMessage(int messageNum, const MessageParam ¶m, Entit if (!getSubVar(V_TELEPORTER_DEST_AVAILABLE, _selectedButtonNum)) _selectedButtonNum = _currLocationButtonNum; break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module2900_sprites.cpp b/engines/neverhood/modules/module2900_sprites.cpp index 1ec820abdf..47470d30ca 100644 --- a/engines/neverhood/modules/module2900_sprites.cpp +++ b/engines/neverhood/modules/module2900_sprites.cpp @@ -166,6 +166,8 @@ uint32 SsScene2901LocationButton::handleMessage(int messageNum, const MessagePar } messageResult = 1; break; + default: + break; } return messageResult; } @@ -225,6 +227,8 @@ uint32 SsScene2901BigButton::handleMessage(int messageNum, const MessageParam &p } messageResult = 1; break; + default: + break; } return messageResult; } diff --git a/engines/neverhood/modules/module3000.cpp b/engines/neverhood/modules/module3000.cpp index 0f84dbd18d..e62f690f6d 100644 --- a/engines/neverhood/modules/module3000.cpp +++ b/engines/neverhood/modules/module3000.cpp @@ -168,6 +168,8 @@ void Module3000::createScene(int sceneNum, int which) { case 1008: createSmackerScene(getGlobalVar(V_CANNON_SMACKER_NAME), true, true, false); break; + default: + break; } SetUpdateHandler(&Module3000::updateScene); _childObject->handleUpdate(); @@ -277,6 +279,8 @@ void Module3000::updateScene() { case 1008: createScene(8, -1); break; + default: + break; } } else { switch (_vm->gameState().sceneNum) { @@ -354,6 +358,8 @@ void Module3000::updateScene() { _vm->_soundMan->setTwoSoundsPlayFlag(false); } break; + default: + break; } } } @@ -523,6 +529,8 @@ void Scene3009::update() { playActionVideo(); } break; + default: + break; } } @@ -630,6 +638,8 @@ uint32 Scene3009::handleMessage(int messageNum, const MessageParam ¶m, Entit } } break; + default: + break; } return 0; } @@ -764,6 +774,8 @@ uint32 Scene3010::handleMessage(int messageNum, const MessageParam ¶m, Entit case 0x2003: _boltUnlocked[param.asInteger()] = false; break; + default: + break; } return 0; } @@ -833,6 +845,8 @@ void Scene3011::update() { if (_currentSymbolIndex >= 12) _currentSymbolIndex = 0; break; + default: + break; } } } @@ -850,6 +864,8 @@ uint32 Scene3011::handleMessage(int messageNum, const MessageParam ¶m, Entit if (_countdown == 0) _countdown = 1; break; + default: + break; } return 0; } diff --git a/engines/neverhood/modules/module3000_sprites.cpp b/engines/neverhood/modules/module3000_sprites.cpp index 23a388efe4..63f31cc5a3 100644 --- a/engines/neverhood/modules/module3000_sprites.cpp +++ b/engines/neverhood/modules/module3000_sprites.cpp @@ -129,6 +129,8 @@ uint32 SsScene3009FireCannonButton::handleMessage(int messageNum, const MessageP } messageResult = 1; break; + default: + break; } return messageResult; } @@ -229,6 +231,8 @@ uint32 SsScene3009SymbolArrow::handleMessage(int messageNum, const MessageParam } messageResult = 1; break; + default: + break; } return messageResult; } @@ -262,6 +266,8 @@ uint32 AsScene3009VerticalIndicator::handleMessage(int messageNum, const Message } messageResult = 1; break; + default: + break; } return messageResult; } @@ -292,6 +298,8 @@ uint32 AsScene3009HorizontalIndicator::handleMessage(int messageNum, const Messa } messageResult = 1; break; + default: + break; } return messageResult; } @@ -374,6 +382,8 @@ uint32 AsScene3009Symbol::handleMessage(int messageNum, const MessageParam ¶ } messageResult = 1; break; + default: + break; } return messageResult; } @@ -472,6 +482,8 @@ uint32 SsScene3010DeadBoltButton::handleMessage(int messageNum, const MessagePar } messageResult = 1; break; + default: + break; } return messageResult; } @@ -532,6 +544,8 @@ uint32 AsScene3010DeadBolt::hmAnimation(int messageNum, const MessageParam ¶ case NM_ANIMATION_STOP: gotoNextState(); break; + default: + break; } return messageResult; } @@ -662,6 +676,8 @@ uint32 SsScene3011Button::handleMessage(int messageNum, const MessageParam ¶ } messageResult = 1; break; + default: + break; } return messageResult; } diff --git a/engines/neverhood/mouse.cpp b/engines/neverhood/mouse.cpp index 0abbeba19d..864617f4a8 100644 --- a/engines/neverhood/mouse.cpp +++ b/engines/neverhood/mouse.cpp @@ -157,6 +157,8 @@ uint32 Mouse::handleMessage(int messageNum, const MessageParam ¶m, Entity *s updateCursorNum(); updateBounds(); break; + default: + break; } return messageResult; } @@ -249,6 +251,8 @@ void Mouse::updateCursorNum() { break; } break; + default: + break; } } diff --git a/engines/neverhood/navigationscene.cpp b/engines/neverhood/navigationscene.cpp index a1eeae9c1c..161fa3f158 100644 --- a/engines/neverhood/navigationscene.cpp +++ b/engines/neverhood/navigationscene.cpp @@ -121,6 +121,8 @@ uint32 NavigationScene::handleMessage(int messageNum, const MessageParam ¶m, case NM_ANIMATION_STOP: _smackerDone = true; break; + default: + break; } return 0; } @@ -203,6 +205,8 @@ void NavigationScene::handleNavigation(const NPoint &mousePos) { _leaveSceneAfter = true; } break; + default: + break; } if (oldIsTurning != _isTurning) diff --git a/engines/neverhood/resource.cpp b/engines/neverhood/resource.cpp index 8aba0ad37b..6ddd241177 100644 --- a/engines/neverhood/resource.cpp +++ b/engines/neverhood/resource.cpp @@ -490,6 +490,8 @@ void DataResource::load(uint32 fileHash) { _rectArrays.push_back(rectArray); break; } + default: + break; } _directory.push_back(drDirectoryItem); } diff --git a/engines/neverhood/scene.cpp b/engines/neverhood/scene.cpp index 8ed988c0fc..38b878c0cb 100644 --- a/engines/neverhood/scene.cpp +++ b/engines/neverhood/scene.cpp @@ -333,6 +333,8 @@ uint32 Scene::handleMessage(int messageNum, const MessageParam ¶m, Entity *s // Set the sender's surface priority setSurfacePriority(((Sprite*)sender)->getSurface(), param.asInteger()); break; + default: + break; } return 0; } @@ -540,6 +542,8 @@ uint16 Scene::convertMessageNum(uint32 messageNum) { return 0x4004; case 0x428D4894: return 0x101A; + default: + break; } return 0x1000; } @@ -620,6 +624,8 @@ uint32 StaticScene::handleMessage(int messageNum, const MessageParam ¶m, Ent if (param.asPoint().x <= 20 || param.asPoint().x >= 620) leaveScene(0); break; + default: + break; } return 0; } diff --git a/engines/neverhood/smackerscene.cpp b/engines/neverhood/smackerscene.cpp index 50677d7d5c..ea9f4d3f7b 100644 --- a/engines/neverhood/smackerscene.cpp +++ b/engines/neverhood/smackerscene.cpp @@ -116,6 +116,8 @@ uint32 SmackerScene::handleMessage(int messageNum, const MessageParam ¶m, En case NM_ANIMATION_STOP: _playNextVideoFlag = true; break; + default: + break; } return messageResult; } |