[Scummvm-git-logs] scummvm master -> 8a3fc359b21cb9e83244bf869e6ae22ae98bb95d

[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:
5792c61933 GLK: ADRIFT: Added missing parenthesis. Loop was broken
8a3fc359b2 DEVTOOLS: Modified macros, so they are less error-prone.


Commit: 5792c61933e8bba91283f5c41bf45abd0a8d9905
    https://github.com/scummvm/scummvm/commit/5792c61933e8bba91283f5c41bf45abd0a8d9905
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-28T08:56:25+02:00

Commit Message:
GLK: ADRIFT: Added missing parenthesis. Loop was broken

Changed paths:
    engines/glk/adrift/serialization.cpp


diff --git a/engines/glk/adrift/serialization.cpp b/engines/glk/adrift/serialization.cpp
index e34d343634..5f65e05196 100644
--- a/engines/glk/adrift/serialization.cpp
+++ b/engines/glk/adrift/serialization.cpp
@@ -255,7 +255,7 @@ bool LoadSerializer::load() {
 	// Read the _game name, and compare with the one in the _game.  Fail if they don't match exactly.
 	// A tighter check than this would perhaps be preferable, say, something based on the TAF file
 	// header, but this isn't in the save file format.
-	
+
 	vt_key[0].string = "Globals";
 	vt_key[1].string = "GameName";
 	gamename = prop_get_string(bundle, "S<-ss", vt_key);
@@ -361,8 +361,9 @@ bool LoadSerializer::load() {
 
 		gs_set_npc_location(new_game, index_, readInt(context)); CHECK;
 		gs_set_npc_seen(new_game, index_, readBool(context)); CHECK;
-		for (walk = 0; walk < gs_npc_walkstep_count(new_game, index_); walk++)
+		for (walk = 0; walk < gs_npc_walkstep_count(new_game, index_); walk++) {
 			gs_set_npc_walkstep(new_game, index_, walk, readInt(context)); CHECK;
+		}
 	}
 
 	// Restore each variable.


Commit: 8a3fc359b21cb9e83244bf869e6ae22ae98bb95d
    https://github.com/scummvm/scummvm/commit/8a3fc359b21cb9e83244bf869e6ae22ae98bb95d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-28T08:56:51+02:00

Commit Message:
DEVTOOLS: Modified macros, so they are less error-prone.

Code generation for libsdl_net was always performed. The condition
did not work as expected. Macros are dangerous.

Changed paths:
    devtools/create_project/xcode.cpp


diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index f057339295..e7ffda9178 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -404,14 +404,14 @@ void XcodeProvider::setupCopyFilesBuildPhase() {
 	// Nothing to do here
 }
 
-#define DEF_SYSFRAMEWORK(framework) properties[framework".framework"] = FileProperty("wrapper.framework", framework".framework", "System/Library/Frameworks/" framework ".framework", "SDKROOT"); \
-	ADD_SETTING_ORDER_NOVALUE(children, getHash(framework".framework"), framework".framework", fwOrder++);
+#define DEF_SYSFRAMEWORK(framework) { properties[framework".framework"] = FileProperty("wrapper.framework", framework".framework", "System/Library/Frameworks/" framework ".framework", "SDKROOT"); \
+	ADD_SETTING_ORDER_NOVALUE(children, getHash(framework".framework"), framework".framework", fwOrder++); }
 
-#define DEF_SYSTBD(lib) properties[lib".tbd"] = FileProperty("sourcecode.text-based-dylib-definition", lib".tbd", "usr/lib/" lib ".tbd", "SDKROOT"); \
-	ADD_SETTING_ORDER_NOVALUE(children, getHash(lib".tbd"), lib".tbd", fwOrder++);
+#define DEF_SYSTBD(lib) { properties[lib".tbd"] = FileProperty("sourcecode.text-based-dylib-definition", lib".tbd", "usr/lib/" lib ".tbd", "SDKROOT"); \
+	ADD_SETTING_ORDER_NOVALUE(children, getHash(lib".tbd"), lib".tbd", fwOrder++); }
 
-#define DEF_LOCALLIB_STATIC_PATH(path,lib,absolute) properties[lib".a"] = FileProperty("archive.ar", lib ".a", path, (absolute ? "\"<absolute>\"" : "\"<group>\"")); \
-	ADD_SETTING_ORDER_NOVALUE(children, getHash(lib".a"), lib".a", fwOrder++);
+#define DEF_LOCALLIB_STATIC_PATH(path,lib,absolute) { properties[lib".a"] = FileProperty("archive.ar", lib ".a", path, (absolute ? "\"<absolute>\"" : "\"<group>\"")); \
+	ADD_SETTING_ORDER_NOVALUE(children, getHash(lib".a"), lib".a", fwOrder++); }
 
 #define DEF_LOCALLIB_STATIC(lib) DEF_LOCALLIB_STATIC_PATH(lib ".a", lib, false)
 
@@ -498,13 +498,15 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
 	if (setup.useSDL2) {
 		DEF_LOCALLIB_STATIC("libSDL2main");
 		DEF_LOCALLIB_STATIC("libSDL2");
-		if (CONTAINS_DEFINE(setup.defines, "USE_SDL_NET"))
+		if (CONTAINS_DEFINE(setup.defines, "USE_SDL_NET")) {
 			DEF_LOCALLIB_STATIC("libSDL2_net");
+		}
 	} else {
 		DEF_LOCALLIB_STATIC("libSDLmain");
 		DEF_LOCALLIB_STATIC("libSDL");
-		if (CONTAINS_DEFINE(setup.defines, "USE_SDL_NET"))
+		if (CONTAINS_DEFINE(setup.defines, "USE_SDL_NET")) {
 			DEF_LOCALLIB_STATIC("libSDL_net");
+		}
 	}
 
 	frameworksGroup->_properties["children"] = children;