[Scummvm-cvs-logs] scummvm master -> 784472a6690f4be0ba7af4841dcd6b167c639a64

[wjp]

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:
784472a669 Revert "SCUMM: revert savegame version to 89"


Commit: 784472a6690f4be0ba7af4841dcd6b167c639a64
    https://github.com/scummvm/scummvm/commit/784472a6690f4be0ba7af4841dcd6b167c639a64
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2012-02-11T01:55:55-08:00

Commit Message:
Revert "SCUMM: revert savegame version to 89"

This reverts commit 65fc7225bb31e72120dcdf16e91ae377c657548d.

Increasing the savegame version on a branch and then decreasing it again
leads to problems with loading current savegames in old commits during
a bisect.

Changed paths:
    engines/scumm/actor.cpp
    engines/scumm/saveload.cpp
    engines/scumm/saveload.h



diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index dee601b..5349642 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -2902,13 +2902,14 @@ void Actor_v0::saveLoadWithSerializer(Serializer *ser) {
 
 	static const SaveLoadEntry actorEntries[] = {
 		MKLINE(Actor_v0, _costCommand, sleByte, VER(84)),
-		MK_OBSOLETE(Actor_v0, _costFrame, sleByte, VER(84), VER(88)),
+		MK_OBSOLETE(Actor_v0, _costFrame, sleByte, VER(84), VER(89)),
 		MKLINE(Actor_v0, _miscflags, sleByte, VER(84)),
 		MKLINE(Actor_v0, _speaking, sleByte, VER(84)),
-		MK_OBSOLETE(Actor_v0, _speakingPrev, sleByte, VER(84), VER(88)),
+		MK_OBSOLETE(Actor_v0, _speakingPrev, sleByte, VER(84), VER(89)),
+		MK_OBSOLETE(Actor_v0, _limbTemp, sleByte, VER(89), VER(89)),
 		MKLINE(Actor_v0, _animFrameRepeat, sleByte, VER(89)),
 		MKARRAY(Actor_v0, _limbFrameRepeatNew[0], sleInt8, 8, VER(89)),
-		MKARRAY(Actor_v0, _limbFrameRepeat[0], sleInt8, 8, VER(89)),
+		MKARRAY(Actor_v0, _limbFrameRepeat[0], sleInt8, 8, VER(90)),
 		MKEND()
 	};
 
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 51a291b..6e54377 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -1210,7 +1210,7 @@ void ScummEngine::saveOrLoad(Serializer *s) {
 			// Since roughly v13 of the save games, the objs storage has changed a bit
 			for (i = _numObjectsInRoom; i < _numLocalObjects; i++)
 				_objs[i].obj_nr = 0;
-		} else if (_game.version == 0 && s->getVersion() < VER(89)) {
+		} else if (_game.version == 0 && s->getVersion() < VER(91)) {
 			for (i = 0; i < _numLocalObjects; i++) {
 				// Merge object id and type (previously stored in flags)
 				if (_objs[i].obj_nr != 0 && OBJECT_V0_TYPE(_objs[i].obj_nr) == 0 && _objs[i].flags != 0)
@@ -1504,14 +1504,14 @@ void ScummEngine_v0::saveOrLoad(Serializer *s) {
 	const SaveLoadEntry v0Entrys[] = {
 		MKLINE(ScummEngine_v0, _currentMode, sleByte, VER(78)),
 		MKLINE(ScummEngine_v0, _currentLights, sleByte, VER(78)),
-		MKLINE(ScummEngine_v0, _activeVerb, sleByte, VER(89)),
-		MKLINE(ScummEngine_v0, _activeObject, sleUint16, VER(89)),
-		MKLINE(ScummEngine_v0, _activeObject2, sleUint16, VER(89)),
-		MKLINE(ScummEngine_v0, _cmdVerb, sleByte, VER(89)),
-		MKLINE(ScummEngine_v0, _cmdObject, sleUint16, VER(89)),
-		MKLINE(ScummEngine_v0, _cmdObject2, sleUint16, VER(89)),
-		MKLINE(ScummEngine_v0, _walkToObject, sleUint16, VER(89)),
-		MKLINE(ScummEngine_v0, _walkToObjectState, sleByte, VER(89)),
+		MKLINE(ScummEngine_v0, _activeVerb, sleByte, VER(92)),
+		MKLINE(ScummEngine_v0, _activeObject, sleUint16, VER(92)),
+		MKLINE(ScummEngine_v0, _activeObject2, sleUint16, VER(92)),
+		MKLINE(ScummEngine_v0, _cmdVerb, sleByte, VER(92)),
+		MKLINE(ScummEngine_v0, _cmdObject, sleUint16, VER(92)),
+		MKLINE(ScummEngine_v0, _cmdObject2, sleUint16, VER(92)),
+		MKLINE(ScummEngine_v0, _walkToObject, sleUint16, VER(92)),
+		MKLINE(ScummEngine_v0, _walkToObjectState, sleByte, VER(92)),
 		MKEND()
 	};
  	s->saveLoadEntries(this, v0Entrys);
diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h
index 898f80f..90feee6 100644
--- a/engines/scumm/saveload.h
+++ b/engines/scumm/saveload.h
@@ -47,7 +47,7 @@ namespace Scumm {
  * only saves/loads those which are valid for the version of the savegame
  * which is being loaded/saved currently.
  */
-#define CURRENT_VER 89
+#define CURRENT_VER 92
 
 /**
  * An auxillary macro, used to specify savegame versions. We use this instead