[Scummvm-cvs-logs] scummvm master -> 84e99ae652662dfb32294cd9034666af9cf47e76

[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:
84e99ae652 AVALANCHE: Fix savegames compatibility before/after Nim implementation


Commit: 84e99ae652662dfb32294cd9034666af9cf47e76
    https://github.com/scummvm/scummvm/commit/84e99ae652662dfb32294cd9034666af9cf47e76
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-23T01:18:04-08:00

Commit Message:
AVALANCHE: Fix savegames compatibility before/after Nim implementation

Changed paths:
    engines/avalanche/avalanche.h
    engines/avalanche/nim.cpp
    engines/avalanche/parser.cpp



diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index fac17df..87eb3c2 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -60,7 +60,7 @@ struct AvalancheGameDescription {
 	ADGameDescription desc;
 };
 
-static const int kSavegameVersion = 1;
+static const int kSavegameVersion = 2;
 
 enum Pitch {
 	kPitchInvalid,
diff --git a/engines/avalanche/nim.cpp b/engines/avalanche/nim.cpp
index faca3e4..d066ffc 100644
--- a/engines/avalanche/nim.cpp
+++ b/engines/avalanche/nim.cpp
@@ -43,6 +43,9 @@ void Nim::resetVariables() {
 }
 
 void Nim::synchronize(Common::Serializer &sz) {
+	if (sz.isLoading() && sz.getVersion() < 2)
+		return;
+
 	sz.syncAsByte(_playedNim);
 }
 
diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp
index a77a71d..f43ba61 100644
--- a/engines/avalanche/parser.cpp
+++ b/engines/avalanche/parser.cpp
@@ -2471,6 +2471,10 @@ void Parser::synchronize(Common::Serializer &sz) {
 	sz.syncAsByte(_wearing);
 	sz.syncAsByte(_sworeNum);
 	sz.syncAsByte(_alcoholLevel);
+	if (sz.isLoading() && sz.getVersion() < 2) {
+		int dummy;	
+		sz.syncAsByte(dummy);
+	}
 	sz.syncAsByte(_boughtOnion);
 }