From 65fc7225bb31e72120dcdf16e91ae377c657548d Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 11 Feb 2012 00:10:58 +0100
Subject: SCUMM: revert savegame version to 89

Previous versions 89-92 are merged into version 89.
---
 engines/scumm/actor.cpp    |  7 +++----
 engines/scumm/saveload.cpp | 18 +++++++++---------
 engines/scumm/saveload.h   |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'engines')

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 53496428e3..dee601b273 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -2902,14 +2902,13 @@ 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(89)),
+		MK_OBSOLETE(Actor_v0, _costFrame, sleByte, VER(84), VER(88)),
 		MKLINE(Actor_v0, _miscflags, sleByte, VER(84)),
 		MKLINE(Actor_v0, _speaking, sleByte, VER(84)),
-		MK_OBSOLETE(Actor_v0, _speakingPrev, sleByte, VER(84), VER(89)),
-		MK_OBSOLETE(Actor_v0, _limbTemp, sleByte, VER(89), VER(89)),
+		MK_OBSOLETE(Actor_v0, _speakingPrev, sleByte, VER(84), VER(88)),
 		MKLINE(Actor_v0, _animFrameRepeat, sleByte, VER(89)),
 		MKARRAY(Actor_v0, _limbFrameRepeatNew[0], sleInt8, 8, VER(89)),
-		MKARRAY(Actor_v0, _limbFrameRepeat[0], sleInt8, 8, VER(90)),
+		MKARRAY(Actor_v0, _limbFrameRepeat[0], sleInt8, 8, VER(89)),
 		MKEND()
 	};
 
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 6e54377199..51a291b7f2 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(91)) {
+		} else if (_game.version == 0 && s->getVersion() < VER(89)) {
 			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(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)),
+		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)),
 		MKEND()
 	};
  	s->saveLoadEntries(this, v0Entrys);
diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h
index 90feee6dc0..898f80f867 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 92
+#define CURRENT_VER 89
 
 /**
  * An auxillary macro, used to specify savegame versions. We use this instead
-- 
cgit v1.2.3