aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorTorbjörn Andersson2017-08-06 13:30:51 +0200
committerTorbjörn Andersson2017-08-06 13:30:51 +0200
commit70a2ca8b7d64e993fdab89c7b8b0d30ab4334824 (patch)
tree2e0686f9a69dc65cf8f2aeb801ccae8f2352b635 /engines/kyra
parent38a8015b830f8cec32f07bb9262d47cf096644e5 (diff)
downloadscummvm-rg350-70a2ca8b7d64e993fdab89c7b8b0d30ab4334824.tar.gz
scummvm-rg350-70a2ca8b7d64e993fdab89c7b8b0d30ab4334824.tar.bz2
scummvm-rg350-70a2ca8b7d64e993fdab89c7b8b0d30ab4334824.zip
JANITORIAL: Silence more GCC 7 warnings
All these fall through were marked as deliberate, so again I've only changed the comment to silence GCC.
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/gui_eob.cpp2
-rw-r--r--engines/kyra/sequences_lok.cpp3
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 9456e575db..968bca2be2 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -1286,7 +1286,7 @@ void EoBCoreEngine::gui_processWeaponSlotClickRight(int charIndex, int slotIndex
case 10:
if (_flags.gameID == GI_EOB1)
vl += _clericSpellOffset;
- // drop through
+ // fall through
case 9:
// Mage/Cleric Scroll
if (!_currentControlMode)
diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp
index 8a41ee9a21..58484c2fd9 100644
--- a/engines/kyra/sequences_lok.cpp
+++ b/engines/kyra/sequences_lok.cpp
@@ -1483,8 +1483,7 @@ int KyraEngine_LoK::handleMalcolmFlag() {
_malcolmFrame = 0;
_malcolmFlag = 2;
_malcolmTimer2 = 0;
-
- // Fall through to the next case
+ // fall through
case 2:
if (_system->getMillis() >= _malcolmTimer2) {