aboutsummaryrefslogtreecommitdiff
path: root/engines/sky
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/sky
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/sky')
-rw-r--r--engines/sky/debug.cpp3
-rw-r--r--engines/sky/logic.cpp3
2 files changed, 6 insertions, 0 deletions
diff --git a/engines/sky/debug.cpp b/engines/sky/debug.cpp
index d663bd206d..78ded552d2 100644
--- a/engines/sky/debug.cpp
+++ b/engines/sky/debug.cpp
@@ -1251,10 +1251,13 @@ bool Debugger::Cmd_LogicCommand(int argc, const char **argv) {
switch (argc) {
case 5:
arg3 = atoi(argv[4]);
+ // fall through
case 4:
arg2 = atoi(argv[3]);
+ // fall through
case 3:
arg1 = atoi(argv[2]);
+ // fall through
}
for (int i = 0; i < numMCodes; ++i) {
diff --git a/engines/sky/logic.cpp b/engines/sky/logic.cpp
index 207db3b497..c96d74e950 100644
--- a/engines/sky/logic.cpp
+++ b/engines/sky/logic.cpp
@@ -1313,10 +1313,13 @@ uint16 Logic::script(uint16 scriptNo, uint16 offset) {
switch (a) {
case 3:
c = pop();
+ // fall through
case 2:
b = pop();
+ // fall through
case 1:
a = pop();
+ // fall through
}
uint16 mcode = *scriptData++ / 4; // get mcode number