From 2050ae13b6519cfaf0e72db8a35ebdbd8c2e62eb Mon Sep 17 00:00:00 2001 From: D G Turner Date: Thu, 5 Dec 2019 22:37:54 +0000 Subject: NEVERHOOD: Fix Missing Default Switch Cases These are flagged by GCC if -Wswitch-default is enabled. --- engines/neverhood/modules/module1000_sprites.cpp | 74 ++++++++++++++++++++++++ 1 file changed, 74 insertions(+) (limited to 'engines/neverhood/modules/module1000_sprites.cpp') 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; } -- cgit v1.2.3