From e9e26a75cac2691310848a3ea82f4eaa26af0835 Mon Sep 17 00:00:00 2001 From: athrxx Date: Tue, 1 Nov 2011 17:03:33 +0100 Subject: [PATCH] SCUMM: fix save file incompatibility between DS and other ports for non FM-TOWNS games --- engines/scumm/saveload.cpp | 2 +- engines/scumm/saveload.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index 3ab13df032f8..ecf4e4ba33ec 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -1293,7 +1293,7 @@ void ScummEngine::saveOrLoad(Serializer *s) { #ifndef DISABLE_TOWNS_DUAL_LAYER_MODE // FM-Towns specific (extra palette data, color cycle data, etc.) - if (s->getVersion() >= VER(82)) { + if (_game.platform == Common::kPlatformFMTowns && s->getVersion() >= VER(87) || (s->getVersion() >= VER(82) && s->getVersion() < VER(87))) { const SaveLoadEntry townsFields[] = { MKLINE(Common::Rect, left, sleInt16, VER(82)), MKLINE(Common::Rect, top, sleInt16, VER(82)), diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h index 16c225d20e22..d55ec2d0474a 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 86 +#define CURRENT_VER 87 /** * An auxillary macro, used to specify savegame versions. We use this instead