aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorTravis Howell2009-08-16 01:46:47 +0000
committerTravis Howell2009-08-16 01:46:47 +0000
commit43d57fd333afa54f4e85f30e2ef8231444988066 (patch)
treeec468e95e18116a5996ccc17832c7fa88d7dc0d3 /engines/scumm
parentac45cf6f6f0cf6e41b608561316bcbda115fb6b1 (diff)
downloadscummvm-rg350-43d57fd333afa54f4e85f30e2ef8231444988066.tar.gz
scummvm-rg350-43d57fd333afa54f4e85f30e2ef8231444988066.tar.bz2
scummvm-rg350-43d57fd333afa54f4e85f30e2ef8231444988066.zip
Update branch specific save game changes, to prevent conflicts.
svn-id: r43421
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/actor.cpp4
-rw-r--r--engines/scumm/saveload.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 227ae1d316..9dab776b67 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -2553,8 +2553,8 @@ void Actor::saveLoadWithSerializer(Serializer *ser) {
// Actor palette grew from 64 to 256 bytes and switched to uint16 in HE games
MKARRAY_OLD(Actor, _palette[0], sleByte, 64, VER(8), VER(9)),
- MKARRAY_OLD(Actor, _palette[0], sleByte, 256, VER(10), VER(77)),
- MKARRAY(Actor, _palette[0], sleUint16, 256, VER(78)),
+ MKARRAY_OLD(Actor, _palette[0], sleByte, 256, VER(10), VER(79)),
+ MKARRAY(Actor, _palette[0], sleUint16, 256, VER(80)),
MK_OBSOLETE(Actor, _mask, sleByte, VER(8), VER(9)),
MKLINE(Actor, _shadowMode, sleByte, VER(8)),
diff --git a/engines/scumm/saveload.h b/engines/scumm/saveload.h
index 4f6adc5570..fafb6b383f 100644
--- a/engines/scumm/saveload.h
+++ b/engines/scumm/saveload.h
@@ -50,7 +50,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 79
+#define CURRENT_VER 80
/**
* An auxillary macro, used to specify savegame versions. We use this instead