aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2019-09-29 17:14:23 -0700
committerPaul Gilbert2019-09-29 17:18:04 -0700
commit34c5999ddf9f18a4a5d89535bfed15fdcabf0d02 (patch)
tree9b0ef8ba7b1841925a0e7583e1268699fed2a735
parente2b9112c2cf0c2ce889f6e8f5c3fa61cc4305438 (diff)
downloadscummvm-rg350-34c5999ddf9f18a4a5d89535bfed15fdcabf0d02.tar.gz
scummvm-rg350-34c5999ddf9f18a4a5d89535bfed15fdcabf0d02.tar.bz2
scummvm-rg350-34c5999ddf9f18a4a5d89535bfed15fdcabf0d02.zip
GLK: ADRIFT: Warning fixes
-rw-r--r--engines/glk/adrift/scprops.cpp4
-rw-r--r--engines/glk/adrift/sctasks.cpp6
2 files changed, 8 insertions, 2 deletions
diff --git a/engines/glk/adrift/scprops.cpp b/engines/glk/adrift/scprops.cpp
index 166f506f68..e5474d8295 100644
--- a/engines/glk/adrift/scprops.cpp
+++ b/engines/glk/adrift/scprops.cpp
@@ -872,8 +872,8 @@ void prop_adopt(sc_prop_setref_t bundle, void *addr) {
*
* Print out a complete properties set.
*/
-static sc_bool prop_debug_is_dictionary_string(sc_prop_setref_t bundle, const void *pointer) {
- const sc_char *const pointer_ = (const sc_char * const)pointer;
+static sc_bool prop_debug_is_dictionary_string(sc_prop_setref_t bundle, const sc_char *pointer) {
+ const sc_char *const pointer_ = pointer;
sc_int index_;
/* Compare by pointer directly, not by string value comparisons. */
diff --git a/engines/glk/adrift/sctasks.cpp b/engines/glk/adrift/sctasks.cpp
index cab6fcbb81..64137389f9 100644
--- a/engines/glk/adrift/sctasks.cpp
+++ b/engines/glk/adrift/sctasks.cpp
@@ -273,6 +273,7 @@ static void task_move_object(sc_gameref_t game, sc_int object, sc_int var2, sc_i
default:
sc_fatal("task_move_object: unknown move type, %ld\n", var2);
+ break;
}
}
@@ -639,6 +640,7 @@ static void task_run_change_variable_action(sc_gameref_t game,
default:
sc_fatal("task_run_change_variable_action:"
" unknown integer change type, %ld\n", var2);
+ break;
}
case TAFVAR_STRING: /* String */
@@ -683,11 +685,13 @@ static void task_run_change_variable_action(sc_gameref_t game,
default:
sc_fatal("task_run_change_variable_action:"
" unknown string change type, %ld\n", var2);
+ break;
}
default:
sc_fatal("task_run_change_variable_action:"
" invalid variable type, %ld\n", type);
+ break;
}
}
@@ -833,6 +837,7 @@ static sc_bool task_run_end_game_action(sc_gameref_t game, sc_int var1) {
default:
sc_fatal("task_run_end_game_action: invalid type, %ld\n", var1);
+ break;
}
/* Stop the game, and note that it's not resumeable. */
@@ -932,6 +937,7 @@ static sc_bool task_run_task_action(sc_gameref_t game, sc_int task, sc_int actio
default:
sc_fatal("task_run_task_action: unknown action type %ld\n", type);
+ break;
}
return status;