thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "SCUMM: revert savegame version to 89"

Browse source 
This reverts commit 65fc7225bb.

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.
This commit is contained in:
Willem Jan Palenstijn 2012-02-11 10:55:55 +01:00
parent 866e23f426
commit 784472a669
3 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
engines/scumm/actor.cpp
View file

@ -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()
};

18
engines/scumm/saveload.cpp
View file

@ -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);

2
engines/scumm/saveload.h
View file

@ -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