[Scummvm-git-logs] scummvm master -> 971530787215ac2f9a36232005288dd8b2898412

digitall dgturner at iee.org
Thu Aug 9 23:57:48 CEST 2018


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

Summary:
9715307872 STARTREK: Fix Various Compiler Warnings.


Commit: 971530787215ac2f9a36232005288dd8b2898412
    https://github.com/scummvm/scummvm/commit/971530787215ac2f9a36232005288dd8b2898412
Author: D G Turner (digitall at scummvm.org)
Date: 2018-08-09T23:06:07+01:00

Commit Message:
STARTREK: Fix Various Compiler Warnings.

Changed paths:
    engines/startrek/saveload.cpp


diff --git a/engines/startrek/saveload.cpp b/engines/startrek/saveload.cpp
index d7c11b7..52bb7cb 100644
--- a/engines/startrek/saveload.cpp
+++ b/engines/startrek/saveload.cpp
@@ -131,7 +131,7 @@ bool StarTrekEngine::loadGame(int slot) {
 
 	if (meta.version > CURRENT_SAVEGAME_VERSION) {
 		delete in;
-		error("Savegame version (%d) is newer than current version (%d). A newer version of ScummVM is needed", meta.version, CURRENT_SAVEGAME_VERSION);
+		error("Savegame version (%u) is newer than current version (%u). A newer version of ScummVM is needed", meta.version, CURRENT_SAVEGAME_VERSION);
 	}
 
 	if (!saveOrLoadGameData(in, nullptr, &meta)) {
@@ -328,7 +328,7 @@ bool StarTrekEngine::saveOrLoadGameData(Common::SeekableReadStream *in, Common::
 		// The action queue
 		if (ser.isLoading()) {
 			_actionQueue = Common::Queue<Action>();
-			int16 n;
+			int16 n = 0;
 			ser.syncAsSint16LE(n);
 			for (int i = 0; i < n; i++) {
 				Action a;





More information about the Scummvm-git-logs mailing list