[Scummvm-cvs-logs] scummvm master -> aee4004b1d6be7ce9f5e2e4674fdc73662c9a6d3

[Strangerke]

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:
aee4004b1d TSAGE: Increase savegame version in order to properly skip the useless variables


Commit: aee4004b1d6be7ce9f5e2e4674fdc73662c9a6d3
    https://github.com/scummvm/scummvm/commit/aee4004b1d6be7ce9f5e2e4674fdc73662c9a6d3
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-02T04:14:09-07:00

Commit Message:
TSAGE: Increase savegame version in order to properly skip the useless variables

Changed paths:
    engines/tsage/globals.cpp
    engines/tsage/saveload.h



diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index 215a2da..a8ab145 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -287,7 +287,8 @@ void BlueForceGlobals::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_safeCombination);
 	s.syncAsSint16LE(_gateStatus);
 	s.syncAsSint16LE(_greenDay5TalkCtr);
-	s.syncAsSint16LE(useless);
+	if (s.getVersion() < 11)
+		s.syncAsSint16LE(useless);
 	s.syncAsSint16LE(_v4CEC8);
 	s.syncAsSint16LE(_v4CECA);
 	s.syncAsSint16LE(_v4CECC);
@@ -302,19 +303,23 @@ void BlueForceGlobals::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_deathReason);
 	s.syncAsSint16LE(_driveFromScene);
 	s.syncAsSint16LE(_driveToScene);
-	s.syncAsSint16LE(useless);
-	s.syncAsSint16LE(useless);
-	s.syncAsSint16LE(useless);
-	s.syncAsSint16LE(useless);
-	s.syncAsSint16LE(useless);
+	if (s.getVersion() < 11) {
+		s.syncAsSint16LE(useless);
+		s.syncAsSint16LE(useless);
+		s.syncAsSint16LE(useless);
+		s.syncAsSint16LE(useless);
+		s.syncAsSint16LE(useless);
+	}
 	s.syncAsSint16LE(_subFlagBitArr1);
 	s.syncAsSint16LE(_subFlagBitArr2);
 	s.syncAsSint16LE(_v50CC2);
 	s.syncAsSint16LE(_scene410Action1Count);
 	s.syncAsSint16LE(_scene410TalkCount);
 	s.syncAsSint16LE(_scene410HarrisonMovedFl);
-	s.syncAsSint16LE(useless);
-	s.syncAsSint16LE(useless);
+	if (s.getVersion() < 11) {
+		s.syncAsSint16LE(useless);
+		s.syncAsSint16LE(useless);
+	}
 	s.syncAsSint16LE(_bookmark);
 	s.syncAsSint16LE(_mapLocationId);
 	s.syncAsSint16LE(_clip1Bullets);
@@ -644,7 +649,7 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_balloonPosition.x);
 	s.syncAsSint16LE(_balloonPosition.y);
 
-	// Synchronise Flub maze vampire data
+	// Synchronize Flub maze vampire data
 	for (i = 0; i < 18; ++i) {
 		s.syncAsSint16LE(_vampireData[i]._isAlive);
 		s.syncAsSint16LE(_vampireData[i]._shotsRequired);
diff --git a/engines/tsage/saveload.h b/engines/tsage/saveload.h
index fc4e12c..0d04579 100644
--- a/engines/tsage/saveload.h
+++ b/engines/tsage/saveload.h
@@ -33,7 +33,7 @@ namespace TsAGE {
 
 typedef void (*SaveNotifierFn)(bool postFlag);
 
-#define TSAGE_SAVEGAME_VERSION 10
+#define TSAGE_SAVEGAME_VERSION 11
 
 class SavedObject;
 
@@ -48,7 +48,7 @@ struct tSageSavegameHeader {
 
 /*--------------------------------------------------------------------------*/
 
-// FIXME: workaround to supress spurious strict-alias warnings on older GCC
+// FIXME: workaround to suppress spurious strict-alias warnings on older GCC
 // versions. this should be resolved with the savegame rewrite
 #define SYNC_POINTER(x) do { \
 	SavedObject **y = (SavedObject **)((void *)&x); \
@@ -59,7 +59,7 @@ struct tSageSavegameHeader {
 	if (s.isLoading()) FIELD = (TYPE)v_##FIELD;
 
 /**
- * Derived serializer class with extra synchronisation types
+ * Derived serializer class with extra synchronization types
  */
 class Serializer : public Common::Serializer {
 public: