aboutsummaryrefslogtreecommitdiff
path: root/engines/mads/nebular/nebular_scenes2.cpp
diff options
context:
space:
mode:
authorD G Turner2019-12-06 03:34:11 +0000
committerD G Turner2019-12-06 03:34:11 +0000
commite75722665d1f3687a71927670e4e2a4491597a53 (patch)
tree7a6bab1f1a889eed49496aeb698635cf141aaea7 /engines/mads/nebular/nebular_scenes2.cpp
parent3ca5080d3e5c340a6db0def09745201b7f153197 (diff)
downloadscummvm-rg350-e75722665d1f3687a71927670e4e2a4491597a53.tar.gz
scummvm-rg350-e75722665d1f3687a71927670e4e2a4491597a53.tar.bz2
scummvm-rg350-e75722665d1f3687a71927670e4e2a4491597a53.zip
MADS: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Diffstat (limited to 'engines/mads/nebular/nebular_scenes2.cpp')
-rw-r--r--engines/mads/nebular/nebular_scenes2.cpp147
1 files changed, 147 insertions, 0 deletions
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);