From e75722665d1f3687a71927670e4e2a4491597a53 Mon Sep 17 00:00:00 2001 From: D G Turner Date: Fri, 6 Dec 2019 03:34:11 +0000 Subject: MADS: Fix Missing Default Switch Cases These are flagged by GCC if -Wswitch-default is enabled. --- engines/mads/nebular/game_nebular.cpp | 3 + engines/mads/nebular/nebular_scenes1.cpp | 16 ++++ engines/mads/nebular/nebular_scenes2.cpp | 147 +++++++++++++++++++++++++++++++ engines/mads/nebular/nebular_scenes3.cpp | 42 +++++++++ engines/mads/nebular/nebular_scenes4.cpp | 23 ++++- engines/mads/nebular/nebular_scenes6.cpp | 3 + engines/mads/nebular/nebular_scenes7.cpp | 3 + engines/mads/nebular/nebular_scenes8.cpp | 5 ++ 8 files changed, 241 insertions(+), 1 deletion(-) (limited to 'engines/mads/nebular') diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp index 459831fac1..a08c8091f3 100644 --- a/engines/mads/nebular/game_nebular.cpp +++ b/engines/mads/nebular/game_nebular.cpp @@ -92,6 +92,8 @@ void GameNebular::startGame() { // Decompression ending TextView::execute(_vm, "ending4"); break; + default: + break; } do { @@ -289,6 +291,7 @@ void GameNebular::initializeGlobals() { // Final setup based on selected difficulty level switch (_difficulty) { case DIFFICULTY_HARD: + default: _objects.setRoom(OBJ_BLOWGUN, NOWHERE); _objects.setRoom(OBJ_NOTE, NOWHERE); diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp index 9207d87be7..afa9533981 100644 --- a/engines/mads/nebular/nebular_scenes1.cpp +++ b/engines/mads/nebular/nebular_scenes1.cpp @@ -2534,6 +2534,9 @@ void Scene109::step() { case 71: _scene->_reloadSceneFlag = true; break; + + default: + break; } } } @@ -2640,6 +2643,9 @@ void Scene109::actions() { _hoovicDifficultFl = (_game._difficulty == DIFFICULTY_HARD); _globals._spriteIndexes[8] = _scene->_sprites.addSprites(formAnimName('H', (_hoovicDifficultFl ? 3 : 1))); break; + + default: + break; } _vm->_palette->refreshSceneColors(); @@ -2670,6 +2676,8 @@ void Scene109::actions() { _scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_SPRITE, 2, 2); _hoovicTrigger = 3; break; + default: + break; } break; @@ -2775,6 +2783,9 @@ void Scene109::actions() { _globals._sequenceIndexes[3] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[3], false, 7, 1, 0, 0); _scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 5, 16); break; + + default: + break; } _action._inProgress = false; return; @@ -2928,6 +2939,8 @@ void Scene110::actions() { _game._player._stepEnabled = true; _scene->_nextSceneId = 111; break; + default: + break; } } else if ((_action._lookFlag) || _action.isAction(VERB_LOOK, NOUN_CAVE)) _vm->_dialogs->show(11001); @@ -3090,6 +3103,9 @@ void Scene111::actions() { case 1: _scene->_nextSceneId = 110; break; + + default: + break; } } else if (_action.isAction(VERB_LOOK, NOUN_CAVE_FLOOR)) _vm->_dialogs->show(11101); diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp index c19b7b8381..7aeb910f2b 100644 --- a/engines/mads/nebular/nebular_scenes2.cpp +++ b/engines/mads/nebular/nebular_scenes2.cpp @@ -185,6 +185,8 @@ void Scene201::enter() { suffixNum = 2; endTrigger = 78; break; + default: + break; } _globals[kTeleporterCommand] = 0; if (suffixNum >= 0) @@ -691,6 +693,8 @@ void Scene202::step() { if (randVal <= 700) frameStep = 126; break; + default: + break; } if (frameStep >= 0 && frameStep != _scene->_animation[0]->getCurrentFrame() + 1) { @@ -1702,6 +1706,8 @@ void Scene208::updateTrap() { _scene->_dynamicHotspots[idx]._articleNumber = PREP_ON; } break; + default: + break; } } @@ -1779,6 +1785,8 @@ void Scene208::step() { case 82: _game._player._stepEnabled = true; break; + default: + break; } } @@ -2022,6 +2030,8 @@ void Scene209::handlePause() { else _pauseMode = 0; break; + default: + break; } } @@ -2033,6 +2043,8 @@ void Scene209::initPauseCounterThreshold() { _pauseMode = 2; _pauseCounter = 0; break; + default: + break; } } @@ -2077,6 +2089,9 @@ void Scene209::handlePeek() { _scene->_hotspots.activate(227, false); _playingAnimFl = false; break; + + default: + break; } } @@ -2109,6 +2124,9 @@ void Scene209::handleVerticalMove() { _playingAnimFl = false; _scene->_hotspots.activate(227, false); break; + + default: + break; } } @@ -2151,6 +2169,9 @@ void Scene209::handleLookStay() { case 149: _playingAnimFl = false; break; + + default: + break; } } @@ -2176,6 +2197,9 @@ void Scene209::handleLookRight() { if (_dodgeFl) _shouldDodgeFl = true; break; + + default: + break; } } @@ -2204,6 +2228,9 @@ void Scene209::handleBlink() { if (_dodgeFl) _shouldDodgeFl = true; break; + + default: + break; } } @@ -2250,6 +2277,9 @@ void Scene209::handleGetBinoculars() { case 165: _vm->_sound->command(18); break; + + default: + break; } } @@ -2279,6 +2309,9 @@ void Scene209::handleBinocularBlink() { if (_fallFl) _shouldFallFl = true; break; + + default: + break; } } @@ -2304,6 +2337,8 @@ void Scene209::handleBinocularScan() { case 2: _globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 12, 4, 0, 0); break; + default: + break; } _scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 23, 25); _scene->_sequences.updateTimeout(_globals._sequenceIndexes[3], oldIdx); @@ -2334,6 +2369,9 @@ void Scene209::handleBinocularScan() { if (_fallFl) _shouldFallFl = true; break; + + default: + break; } } @@ -2372,6 +2410,9 @@ void Scene209::handleJumpInTree() { _playingAnimFl = false; _scene->_hotspots.activate(227, false); break; + + default: + break; } } @@ -2424,6 +2465,9 @@ void Scene209::handleTongue() { _removeMonkeyFl = false; } break; + + default: + break; } } @@ -2468,6 +2512,9 @@ void Scene209::handleStandFromPeek() { _playingAnimFl = false; _counter = 0; break; + + default: + break; } } @@ -2494,6 +2541,9 @@ void Scene209::handleStandBlink() { case 249: _playingAnimFl = false; break; + + default: + break; } } @@ -2513,6 +2563,9 @@ void Scene209::handleJumpAndHide() { _scene->_hotspots.activate(227, false); _playingAnimFl = false; break; + + default: + break; } } @@ -2617,6 +2670,9 @@ void Scene209::handleMonkeyEating() { case 210: _playingAnimFl = false; break; + + default: + break; } } @@ -2699,6 +2755,9 @@ void Scene209::handleMonkeyFall() { _vm->_dialogs->show(20910); _game._player._stepEnabled = true; break; + + default: + break; } } @@ -2756,6 +2815,9 @@ void Scene209::handleMonkey1() { _pauseMode = 0; _scene->_sequences.addTimer(1, 196); break; + + default: + break; } } @@ -2791,6 +2853,9 @@ void Scene209::handleMonkey2() { _game._player._visible = true; _game._player._stepEnabled = true; break; + + default: + break; } } @@ -2825,6 +2890,9 @@ void Scene209::handleDodge() { _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(136)); } break; + + default: + break; } } @@ -3251,6 +3319,9 @@ void Scene209::step() { case 239: _vm->_sound->command(23); break; + + default: + break; } } @@ -3402,6 +3473,9 @@ void Scene209::actions() { _dialogAbortVal = 5; _action._inProgress = false; return; + + default: + break; } if (_globals[kMonkeyStatus] == MONKEY_HAS_BINOCULARS) { @@ -3462,6 +3536,9 @@ void Scene209::actions() { case 3: break; + + default: + break; } _action._inProgress = false; return; @@ -3495,6 +3572,9 @@ void Scene209::actions() { _vm->_dialogs->showItem (OBJ_BINOCULARS, 0x51AF); _scene->_sprites.remove(_globals._spriteIndexes[10]); break; + + default: + break; } _action._inProgress = false; return; @@ -3689,6 +3769,9 @@ void Scene210::handleConversations() { case 8: handleConversation8(); break; + + default: + break; } } } @@ -3714,6 +3797,9 @@ void Scene210::handleConversation1() { case 184: setDialogNode(0); break; + + default: + break; } } @@ -3730,6 +3816,9 @@ void Scene210::handleConversation2() { case 189: setDialogNode(0); break; + + default: + break; } } @@ -3750,6 +3839,9 @@ void Scene210::handleConversation3() { case 196: setDialogNode(0); break; + + default: + break; } } @@ -3767,6 +3859,9 @@ void Scene210::handleConversation5() { case 207: setDialogNode(0); break; + + default: + break; } } @@ -3783,6 +3878,9 @@ void Scene210::handleConversation6() { case 213: setDialogNode(0); break; + + default: + break; } } @@ -3801,6 +3899,9 @@ void Scene210::handleConversation7() { case 220: setDialogNode(0); break; + + default: + break; } } @@ -3819,6 +3920,9 @@ void Scene210::handleConversation8() { case 227: setDialogNode(0); break; + + default: + break; } } @@ -4103,8 +4207,14 @@ void Scene210::setDialogNode(int node) { _globals[kTwinklesStatus] = TWINKLES_GONE; _scene->_nextSceneId = 216; break; + + default: + break; } break; + + default: + break; } } @@ -4260,6 +4370,8 @@ void Scene210::enter() { quote = 0xDD; number = 2; break; + default: + break; } restoreDialogNode(_curDialogNode, quote, number); @@ -4393,6 +4505,9 @@ void Scene210::step() { } } break; + + default: + break; } if (reset_frame >= 0) { @@ -4501,6 +4616,9 @@ void Scene210::actions() { _conv1.start(); _curDialogNode = 1; break; + + default: + break; } } else if (_action.isAction(VERB_GIVE, NOUN_NATIVE_WOMAN) && _game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId))) { switch (_game._trigger) { @@ -4517,6 +4635,9 @@ void Scene210::actions() { _game._player._stepEnabled = true; _shouldMoveHead = false; break; + + default: + break; } } else if (_action.isAction(VERB_WALK_DOWN, NOUN_PATH_TO_NORTH) || _action.isAction(VERB_WALK_TOWARDS, NOUN_HUT_TO_NORTH)) { _scene->_nextSceneId = 205; @@ -4539,6 +4660,9 @@ void Scene210::actions() { _scene->_dynamicHotspots.setPosition(_doorway, Common::Point(168, 127), FACING_NORTH); _scene->_dynamicHotspots.setCursor(_doorway, CURSOR_GO_UP); break; + + default: + break; } } else if ((_action.isAction(VERB_PULL, NOUN_CURTAIN) || _action.isAction(VERB_CLOSE, NOUN_CURTAIN)) && _globals[kCurtainOpen]) { switch (_game._trigger) { @@ -4561,6 +4685,8 @@ void Scene210::actions() { _game._player._stepEnabled = true; _globals[kCurtainOpen] = false; break; + default: + break; } } else if (_action.isAction(VERB_LOOK, NOUN_HUT)) { if (_globals[kTwinklesStatus] == TWINKLES_GONE) { @@ -4721,6 +4847,9 @@ void Scene211::step() { _ambushFl = false; _globals[kMonkeyStatus] = MONKEY_HAS_BINOCULARS; break; + + default: + break; } } } @@ -4788,6 +4917,9 @@ void Scene211::step() { _scrollY += 14; } break; + + default: + break; } } @@ -4828,6 +4960,9 @@ void Scene211::step() { _scrollY += 14; } break; + + default: + break; } } } @@ -5101,6 +5236,9 @@ void Scene214::step() { _devilRunningFl = false; } break; + + default: + break; } } } @@ -5138,6 +5276,9 @@ void Scene214::actions() { _game._player._stepEnabled = true; _vm->_dialogs->showItem(OBJ_POISON_DARTS, 0x53A5); break; + + default: + break; } } else if (_action.isAction(VERB_TAKE, NOUN_BLOWGUN) && (_game._trigger || _game._objects.isInRoom(OBJ_BLOWGUN))) { switch (_game._trigger) { @@ -5167,6 +5308,9 @@ void Scene214::actions() { _game._player._stepEnabled = true; _vm->_dialogs->showItem(OBJ_BLOWGUN, 0x329); break; + + default: + break; } } else if (_action.isAction(VERB_LOOK, NOUN_WINDOW)) _vm->_dialogs->show(21401); @@ -5313,6 +5457,9 @@ void Scene215::actions() { _game._player._stepEnabled = true; _scene->_sequences.updateTimeout(-1, _globals._sequenceIndexes[2]); break; + + default: + break; } } else { int idx = _vm->getRandomNumber(169, 170); diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp index 6c6afa9a61..3387f67f4f 100644 --- a/engines/mads/nebular/nebular_scenes3.cpp +++ b/engines/mads/nebular/nebular_scenes3.cpp @@ -548,6 +548,9 @@ void Scene307::handlePrisonerEncounter() { case 276: setDialogNode(6); break; + + default: + break; } } @@ -716,6 +719,9 @@ void Scene307::handlePrisonerDialog() { case 0x122: setDialogNode(15); break; + + default: + break; } } @@ -935,6 +941,9 @@ void Scene307::actions() { case 1: setDialogNode(node); break; + + default: + break; } } else if (_action.isAction(VERB_PRY, NOUN_SCALPEL, NOUN_AIR_VENT)) { switch (_game._trigger) { @@ -1183,6 +1192,9 @@ void Scene307::actions() { case 3: _vm->_dialogs->show(30722); break; + + default: + break; } } else return; @@ -1524,6 +1536,9 @@ void Scene309::step() { _scene->_sequences.addTimer(120, 78); } break; + + default: + break; } } @@ -2364,6 +2379,9 @@ void Scene316::actions() { case 4: _scene->_nextSceneId = 321; break; + + default: + break; } } else if (_action.isAction(VERB_LOOK, NOUN_PLATFORM)) _vm->_dialogs->show(31610); @@ -2539,6 +2557,9 @@ void Scene318::handleDialog() { _internCounter = 3420; } break; + + default: + break; } if (_action._activeAction._verbId < 0x19C) { @@ -2760,6 +2781,9 @@ void Scene318::step() { _internVisibleFl = false; } break; + + default: + break; } if ((nextFrame >= 0) && (nextFrame != _scene->_animation[0]->getCurrentFrame())) { @@ -2792,6 +2816,9 @@ void Scene318::step() { _vm->_sound->command(3); _scene->_nextSceneId = 307; break; + + default: + break; } uint32 tmpFrame = _vm->_events->getFrameCounter(); @@ -2924,6 +2951,9 @@ void Scene318::actions() { case 3: _game._player._stepEnabled = true; break; + + default: + break; } _action._inProgress = false; return; @@ -4093,6 +4123,9 @@ void Scene351::actions() { _game._player._stepEnabled = true; _vm->_dialogs->showItem(OBJ_CREDIT_CHIP, 0x32F); break; + + default: + break; } } } else if (_action.isAction(VERB_LOOK, NOUN_VIEW_SCREEN)) @@ -4407,6 +4440,9 @@ void Scene352::actions() { _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(0x101)); _game._player._stepEnabled = true; break; + + default: + break; } } _action._inProgress = false; @@ -4470,6 +4506,9 @@ void Scene352::actions() { _game._player._stepEnabled = true; _vm->_dialogs->showItem(OBJ_GUARDS_ARM, 0x899C); break; + + default: + break; } _action._inProgress = false; return; @@ -4553,6 +4592,9 @@ void Scene352::actions() { _game._player._stepEnabled = true; } break; + + default: + break; } } } else if (_action.isAction(VERB_TAKE, NOUN_YOUR_STUFF)) { diff --git a/engines/mads/nebular/nebular_scenes4.cpp b/engines/mads/nebular/nebular_scenes4.cpp index 8b7eb1a9ec..7fdb3302cb 100644 --- a/engines/mads/nebular/nebular_scenes4.cpp +++ b/engines/mads/nebular/nebular_scenes4.cpp @@ -1059,6 +1059,9 @@ void Scene402::step() { } break; + + default: + break; } switch (_game._trigger) { @@ -1158,6 +1161,9 @@ void Scene402::step() { } break; + + default: + break; } switch (_game._trigger) { @@ -1226,6 +1232,9 @@ void Scene402::step() { _bartenderReady = true; } break; + + default: + break; } if (!_waitingGinnyMove && !_ginnyLooking) { @@ -1276,6 +1285,9 @@ void Scene402::step() { _scene->_sequences.setDepth(_globals._sequenceIndexes[5], 1); _waitingGinnyMove = false; break; + + default: + break; } if ((_game._trigger == 54) && _ginnyLooking) { @@ -1431,6 +1443,9 @@ void Scene402::step() { case 31: _blowingSmoke = false; break; + + default: + break; } if (!_leftWomanMoving) { @@ -2127,7 +2142,7 @@ void Scene402::actions() { default: break; - } + } } break; @@ -2166,6 +2181,9 @@ void Scene402::actions() { break; } break; + + default: + break; } } else if (_action.isAction(VERB_TALKTO, NOUN_WOMAN_IN_CHAIR) && !_firstTalkToGirlInChair) { _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(0x1D7)); @@ -3827,6 +3845,9 @@ void Scene411::actions() { _game._objects[OBJ_CHARGE_CASES].setQuality(3, 1); _vm->_dialogs->showItem(OBJ_CHARGE_CASES, 41142); break; + + default: + break; } _action._inProgress = false; return; diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp index e6e286392c..a07d489778 100644 --- a/engines/mads/nebular/nebular_scenes6.cpp +++ b/engines/mads/nebular/nebular_scenes6.cpp @@ -4414,6 +4414,9 @@ void Scene611::actions() { case 3: nextQuote = 0x27D; break; + + default: + break; } _scene->_kernelMessages.reset(); _scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(nextQuote)); diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp index 6caebb7f79..8ea7dbb583 100644 --- a/engines/mads/nebular/nebular_scenes7.cpp +++ b/engines/mads/nebular/nebular_scenes7.cpp @@ -1826,6 +1826,9 @@ void Scene706::handleTakeVase() { _vm->_dialogs->showItem(OBJ_VASE, 70630); _game._player._stepEnabled = true; break; + + default: + break; } } diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp index 951b270a1c..f4e8f3ecfc 100644 --- a/engines/mads/nebular/nebular_scenes8.cpp +++ b/engines/mads/nebular/nebular_scenes8.cpp @@ -952,6 +952,7 @@ void Scene804::step() { switch (_game._storyMode) { case STORYMODE_NAUGHTY: + default: if (_scene->_animation[0]->getCurrentFrame() == 81) { _resetFrame = 80; _globals[kInSpace] = false; @@ -1029,6 +1030,8 @@ void Scene804::step() { case 31: _resetFrame = 0; break; + default: + break; } } else { if ((_scene->_animation[0]->getCurrentFrame() == 36) && (!_throttleGone)) { @@ -1044,6 +1047,8 @@ void Scene804::step() { case 3: _scene->_sequences.addTimer(130, 120); break; + default: + break; } } -- cgit v1.2.3