[Scummvm-cvs-logs] scummvm master -> 9363e19667d5b4c7af2237bc6f22a636fed1dc0f

[dhewg]

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:
85adc95f79 TSAGE: Remove redundant parameter
9363e19667 TSAGE: Suppress strict-alias warnings on older GCCs


Commit: 85adc95f79b97c179d82291b670acf11ccf1b60c
    https://github.com/scummvm/scummvm/commit/85adc95f79b97c179d82291b670acf11ccf1b60c
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-04-17T03:24:06-07:00

Commit Message:
TSAGE: Remove redundant parameter

Changed paths:
    engines/tsage/debugger.cpp



diff --git a/engines/tsage/debugger.cpp b/engines/tsage/debugger.cpp
index bebf463..ad4e76f 100644
--- a/engines/tsage/debugger.cpp
+++ b/engines/tsage/debugger.cpp
@@ -265,7 +265,7 @@ bool Debugger::Cmd_MoveObject(int argc, const char **argv) {
 	// Check for a flag to clear
 	if ((argc < 2) || (argc > 3)){
 		DebugPrintf("Usage: %s <object number> [<scene number>]\n", argv[0]);
-		DebugPrintf("If no scene is specified, the object will be added to inventory\n", argv[0]);
+		DebugPrintf("If no scene is specified, the object will be added to inventory\n");
 		return true;
 	}
 


Commit: 9363e19667d5b4c7af2237bc6f22a636fed1dc0f
    https://github.com/scummvm/scummvm/commit/9363e19667d5b4c7af2237bc6f22a636fed1dc0f
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-04-17T03:31:59-07:00

Commit Message:
TSAGE: Suppress strict-alias warnings on older GCCs

Changed paths:
    engines/tsage/saveload.h



diff --git a/engines/tsage/saveload.h b/engines/tsage/saveload.h
index 83661b8..945d144 100644
--- a/engines/tsage/saveload.h
+++ b/engines/tsage/saveload.h
@@ -51,7 +51,13 @@ struct tSageSavegameHeader {
 
 /*--------------------------------------------------------------------------*/
 
-#define SYNC_POINTER(x) s.syncPointer((SavedObject **)&x)
+// FIXME: workaround to supress spurious strict-alias warnings on older GCC
+// versions. this should be resolved with the savegame rewrite
+#define SYNC_POINTER(x) do { \
+	SavedObject *y = (SavedObject *)x; \
+	s.syncPointer(&y); \
+} while (false)
+
 #define SYNC_ENUM(FIELD, TYPE) int v_##FIELD = (int)FIELD; s.syncAsUint16LE(v_##FIELD); \
 	if (s.isLoading()) FIELD = (TYPE)v_##FIELD;