[Scummvm-git-logs] scummvm master -> e0ae6b208087698fd1fa5870f870c70d74ba192c

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
34c5999ddf GLK: ADRIFT: Warning fixes
e0ae6b2080 GLK: QUEST: Remove missing file from module.mk


Commit: 34c5999ddf9f18a4a5d89535bfed15fdcabf0d02
    https://github.com/scummvm/scummvm/commit/34c5999ddf9f18a4a5d89535bfed15fdcabf0d02
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-09-29T17:18:04-07:00

Commit Message:
GLK: ADRIFT: Warning fixes

Changed paths:
    engines/glk/adrift/scprops.cpp
    engines/glk/adrift/sctasks.cpp


diff --git a/engines/glk/adrift/scprops.cpp b/engines/glk/adrift/scprops.cpp
index 166f506..e5474d8 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 cab6fcb..6413738 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;


Commit: e0ae6b208087698fd1fa5870f870c70d74ba192c
    https://github.com/scummvm/scummvm/commit/e0ae6b208087698fd1fa5870f870c70d74ba192c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-09-29T17:18:04-07:00

Commit Message:
GLK: QUEST: Remove missing file from module.mk

Changed paths:
    engines/glk/module.mk


diff --git a/engines/glk/module.mk b/engines/glk/module.mk
index 4f4608a..8dfb249 100644
--- a/engines/glk/module.mk
+++ b/engines/glk/module.mk
@@ -189,7 +189,6 @@ MODULE_OBJS := \
 	quest/geas_state.o \
 	quest/geas_util.o \
 	quest/quest.o \
-	quest/tstring.o \
 	quest/read_file.o \
 	quest/string.o \
 	quest/streams.o \