[Scummvm-git-logs] scummvm master -> 469d1777c4bec387de80a918e5c5f976026a0813

[sev-]

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:
2b0cbd3c7e SLUDGE: Fix warning
469d1777c4 SLUDGE: Fix more warnings


Commit: 2b0cbd3c7ea3aa27b675324cc833d13894a4d623
    https://github.com/scummvm/scummvm/commit/2b0cbd3c7ea3aa27b675324cc833d13894a4d623
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-07-13T18:46:55+02:00

Commit Message:
SLUDGE: Fix warning

Changed paths:
    engines/sludge/newfatal.cpp


diff --git a/engines/sludge/newfatal.cpp b/engines/sludge/newfatal.cpp
index 6501f82..925aeab 100644
--- a/engines/sludge/newfatal.cpp
+++ b/engines/sludge/newfatal.cpp
@@ -68,7 +68,7 @@ void registerWindowForFatal() {
 
 int inFatal(const Common::String &str) {
 	killSoundStuff();
-	error(str.c_str());
+	error("%s", str.c_str());
 	return true;
 }
 


Commit: 469d1777c4bec387de80a918e5c5f976026a0813
    https://github.com/scummvm/scummvm/commit/469d1777c4bec387de80a918e5c5f976026a0813
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-07-13T18:48:48+02:00

Commit Message:
SLUDGE: Fix more warnings

Changed paths:
    engines/sludge/loadsave.cpp
    engines/sludge/main_loop.cpp


diff --git a/engines/sludge/loadsave.cpp b/engines/sludge/loadsave.cpp
index eb2cc61..72b1a9a 100644
--- a/engines/sludge/loadsave.cpp
+++ b/engines/sludge/loadsave.cpp
@@ -556,7 +556,7 @@ bool loadGame(const Common::String &fname) {
 	fp->readByte();  // updateDisplay (part of movie playing)
 
 	bool fontLoaded = fp->readByte();
-	int fontNum;
+	int fontNum = 0;
 	Common::String charOrder = "";
 	if (fontLoaded) {
 		fontNum = fp->readUint16BE();
diff --git a/engines/sludge/main_loop.cpp b/engines/sludge/main_loop.cpp
index 3676a3b..614d3a9 100644
--- a/engines/sludge/main_loop.cpp
+++ b/engines/sludge/main_loop.cpp
@@ -71,8 +71,8 @@ Graphics::Surface renderSurface;
 int dialogValue = 0;
 
 void setGameFilePath(char *f) {
-	char currentDir[1000];
 #if 0
+	char currentDir[1000];
 	if (!getcwd(currentDir, 998)) {
 		debugOut("Can't get current directory.\n");
 	}