aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorD G Turner2019-12-16 08:01:21 +0000
committerD G Turner2019-12-16 08:01:21 +0000
commit6a5c34bb6947ccf52544b2f2dbb30874b736e406 (patch)
tree660cc985918abe77ae2de65befbf500e971f3120
parentfc813901ff1fb2e550c7c61cb269ec0498661a2b (diff)
downloadscummvm-rg350-6a5c34bb6947ccf52544b2f2dbb30874b736e406.tar.gz
scummvm-rg350-6a5c34bb6947ccf52544b2f2dbb30874b736e406.tar.bz2
scummvm-rg350-6a5c34bb6947ccf52544b2f2dbb30874b736e406.zip
GLK: AGT: Fix Fallthrough Compiler Warnings
One of these was an actal bug which would have caused the score notification to be toggled if the restart verb was unable to be executed due to lack of memory. This is obviously wrong and has been fixed.
-rw-r--r--engines/glk/agt/os_glk.cpp2
-rw-r--r--engines/glk/agt/runverb.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/engines/glk/agt/os_glk.cpp b/engines/glk/agt/os_glk.cpp
index c80b3b941b..57e9b11451 100644
--- a/engines/glk/agt/os_glk.cpp
+++ b/engines/glk/agt/os_glk.cpp
@@ -3094,10 +3094,12 @@ static glui32 gagt_display_hinted_line(const gagt_lineref_t line, glui32 current
case HINT_NONE:
gagt_fatal("GLK: Page buffer line with no font hint");
gagt_exit();
+ break;
default:
gagt_fatal("GLK: Invalid font hint encountered");
gagt_exit();
+ break;
}
return style;
diff --git a/engines/glk/agt/runverb.cpp b/engines/glk/agt/runverb.cpp
index 4ee3fa5c46..203cfdd430 100644
--- a/engines/glk/agt/runverb.cpp
+++ b/engines/glk/agt/runverb.cpp
@@ -1421,6 +1421,7 @@ void exec_verb(void)
doing_restore = 2;
return;
}
+ break;
case (OLD_VERB+4):
cmd_saveable = 0; /* NOTIFY */
notify_flag = !notify_flag;
@@ -1620,7 +1621,7 @@ int check_obj(parse_rec *act, int verbid,
case 14: /* THROW dobj prep_ iobj */
case 29: /* PUT dobj prep_ iobj */
if (do_disambig == 2 && genvisible(iorec)) return DISAMBIG_SUCC;
- /* ... fall through to next case ... */
+ // fallthrough
case 41: /* DROP */
if (do_disambig == 1 && it_possess(dobj)) return DISAMBIG_SUCC;
break;