aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk/myst_stacks
diff options
context:
space:
mode:
authorD G Turner2019-12-02 00:16:10 +0000
committerD G Turner2019-12-02 00:16:10 +0000
commit1072fca204c17fbd15cd6fbfc388ba300c0dcd03 (patch)
tree12b12a2a7952a988119b41855115b9a0cd1ac158 /engines/mohawk/myst_stacks
parentf122bb69f9e6f9489621982d6e451d459ba79c08 (diff)
downloadscummvm-rg350-1072fca204c17fbd15cd6fbfc388ba300c0dcd03.tar.gz
scummvm-rg350-1072fca204c17fbd15cd6fbfc388ba300c0dcd03.tar.bz2
scummvm-rg350-1072fca204c17fbd15cd6fbfc388ba300c0dcd03.zip
MOHAWK: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
Diffstat (limited to 'engines/mohawk/myst_stacks')
-rw-r--r--engines/mohawk/myst_stacks/myst.cpp8
-rw-r--r--engines/mohawk/myst_stacks/selenitic.cpp11
2 files changed, 19 insertions, 0 deletions
diff --git a/engines/mohawk/myst_stacks/myst.cpp b/engines/mohawk/myst_stacks/myst.cpp
index 2e70778322..820fd714a5 100644
--- a/engines/mohawk/myst_stacks/myst.cpp
+++ b/engines/mohawk/myst_stacks/myst.cpp
@@ -1184,6 +1184,8 @@ void Myst::o_bookGivePage(uint16 var, const ArgumentsArray &args) {
case kBlueFirePlacePage:
mask = 32;
break;
+ default:
+ break;
}
// Wrong book
@@ -1330,6 +1332,8 @@ void Myst::o_imagerPlayButton(uint16 var, const ArgumentsArray &args) {
_state.imagerActive = 1;
}
break;
+ default:
+ break;
}
_vm->_cursor->showCursor();
@@ -1368,6 +1372,8 @@ void Myst::o_imagerEraseButton(uint16 var, const ArgumentsArray &args) {
case 67:
_state.imagerWaterErased = 1;
break;
+ default:
+ break;
}
_state.imagerActive = 0;
@@ -1521,6 +1527,8 @@ void Myst::generatorButtonValue(MystArea *button, uint16 &mask, uint16 &value) {
mask = 512;
value = 9;
break;
+ default:
+ break;
}
}
diff --git a/engines/mohawk/myst_stacks/selenitic.cpp b/engines/mohawk/myst_stacks/selenitic.cpp
index bcc16dc150..e1b36f5b8e 100644
--- a/engines/mohawk/myst_stacks/selenitic.cpp
+++ b/engines/mohawk/myst_stacks/selenitic.cpp
@@ -511,6 +511,8 @@ void Selenitic::mazeRunnerPlayVideo(uint16 video, uint16 pos) {
else
videoName = "backl0";
break;
+ default:
+ break;
}
if (!videoName.empty()) {
@@ -615,6 +617,7 @@ void Selenitic::o_soundReceiverSigma(uint16 var, const ArgumentsArray &args) {
source = 3;
break;
case 1:
+ default:
source = 0;
break;
case 2:
@@ -799,6 +802,8 @@ MystAreaSlider *Selenitic::soundLockSliderFromVar(uint16 var) {
return _soundLockSlider4;
case 24:
return _soundLockSlider5;
+ default:
+ break;
}
return nullptr;
@@ -986,6 +991,8 @@ void Selenitic::soundReceiverIncreaseSpeed() {
case kSoundReceiverSpeedFaster:
// Can't go faster
break;
+ default:
+ break;
}
}
@@ -1080,6 +1087,8 @@ void Selenitic::soundReceiverSolution(uint16 source, uint16 &solution, bool &ena
enabled = _state.emitterEnabledWind;
solution = 2122;
break;
+ default:
+ break;
}
}
@@ -1135,6 +1144,8 @@ void Selenitic::o_soundLock_init(uint16 var, const ArgumentsArray &args) {
_soundLockSlider5 = _vm->getCard()->getResource<MystAreaSlider>(i);
_soundLockSlider5->setStep(_state.soundLockSliderPositions[4]);
break;
+ default:
+ break;
}
} else if (_vm->getCard()->_resources[i]->hasType(kMystAreaImageSwitch)
&& _vm->getCard()->_resources[i]->getImageSwitchVar() == 28) {