aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTorbjörn Andersson2017-08-06 08:50:55 +0200
committerTorbjörn Andersson2017-08-06 11:48:14 +0200
commit14525bb412ece2869d1b2fc2b769ae207fa5f559 (patch)
tree02d7ed068934cfbd8355f3650880b4526cc25b40 /engines
parent86d1b1b050a6af5583fb56ad4126d88ea66d3ec7 (diff)
downloadscummvm-rg350-14525bb412ece2869d1b2fc2b769ae207fa5f559.tar.gz
scummvm-rg350-14525bb412ece2869d1b2fc2b769ae207fa5f559.tar.bz2
scummvm-rg350-14525bb412ece2869d1b2fc2b769ae207fa5f559.zip
JANITORIAL: Silence some GCC 7 warnings
We have lots and lots of -Wimplicit-fallthrough warnings, and I don't know if it's worth fixing them or not. But if we want to, this is how it can be done.
Diffstat (limited to 'engines')
-rw-r--r--engines/agi/global.cpp2
-rw-r--r--engines/agi/graphics.cpp4
-rw-r--r--engines/sci/engine/kstring.cpp1
3 files changed, 4 insertions, 3 deletions
diff --git a/engines/agi/global.cpp b/engines/agi/global.cpp
index bd7e4e490f..c44f9e655a 100644
--- a/engines/agi/global.cpp
+++ b/engines/agi/global.cpp
@@ -69,7 +69,7 @@ byte AgiEngine::getVar(int16 varNr) {
switch (varNr) {
case VM_VAR_SECONDS:
getVarSecondsHeuristicTrigger();
- // is supposed to fall through
+ // fall through
case VM_VAR_MINUTES:
case VM_VAR_HOURS:
case VM_VAR_DAYS:
diff --git a/engines/agi/graphics.cpp b/engines/agi/graphics.cpp
index 3b1b99f458..fa1f11cce4 100644
--- a/engines/agi/graphics.cpp
+++ b/engines/agi/graphics.cpp
@@ -1003,7 +1003,7 @@ void GfxMgr::drawBox(int16 x, int16 y, int16 width, int16 height, byte backgroun
case Common::kRenderHercA:
case Common::kRenderHercG:
lineColor = 0; // change linecolor to black
- // supposed to fall through
+ // fall through
case Common::kRenderCGA:
case Common::kRenderEGA:
case Common::kRenderVGA:
@@ -1027,7 +1027,7 @@ void GfxMgr::drawDisplayRect(int16 x, int16 y, int16 width, int16 height, byte c
case Common::kRenderHercA:
if (color)
color = 1; // change any color except black to green/amber
- // supposed to fall through
+ // fall through
case Common::kRenderEGA:
default:
drawDisplayRectEGA(x, y, width, height, color);
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 4c5f1228de..3c6a0424f8 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -374,6 +374,7 @@ reg_t kFormat(EngineState *s, int argc, reg_t *argv) {
case 'x':
case 'u':
unsignedVar = true;
+ /* fall through */
case 'd': { /* Copy decimal */
/* int templen; -- unused atm */
const char *format_string = "%d";