diff options
| author | Travis Howell | 2005-11-27 23:48:14 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-11-27 23:48:14 +0000 |
| commit | 82589655d0c404ff589bdf38424ae005f1582046 (patch) | |
| tree | 7251577131ca42c086634343da51d6d8839752e4 | |
| parent | 366aee54004cdb1e5401282831172a83e4810677 (diff) | |
| download | scummvm-rg350-82589655d0c404ff589bdf38424ae005f1582046.tar.gz scummvm-rg350-82589655d0c404ff589bdf38424ae005f1582046.tar.bz2 scummvm-rg350-82589655d0c404ff589bdf38424ae005f1582046.zip | |
Actor sounds need to be saved as uint16 for HE games, fixes bug #1367798.
svn-id: r19720
| -rw-r--r-- | scumm/actor.cpp | 5 | ||||
| -rw-r--r-- | scumm/saveload.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 5c5df43eb8..2ae09deb5d 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -2150,9 +2150,10 @@ void Actor::saveLoadWithSerializer(Serializer *ser) { MKLINE(Actor, _scaley, sleByte, VER(8)), MKLINE(Actor, _charset, sleByte, VER(8)), - // Actor sound grew from 8 to 32 bytes + // Actor sound grew from 8 to 32 bytes and switched to uint16 in HE games MKARRAY_OLD(Actor, _sound[0], sleByte, 8, VER(8), VER(36)), - MKARRAY(Actor, _sound[0], sleByte, 32, VER(37)), + MKARRAY_OLD(Actor, _sound[0], sleByte, 32, VER(37), VER(61)), + MKARRAY(Actor, _sound[0], sleUint16, 32, VER(62)), // Actor animVariable grew from 8 to 27 MKARRAY_OLD(Actor, _animVariable[0], sleUint16, 8, VER(8), VER(40)), diff --git a/scumm/saveload.h b/scumm/saveload.h index 6c75ea7cd5..3b10c87465 100644 --- a/scumm/saveload.h +++ b/scumm/saveload.h @@ -45,7 +45,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 61 +#define CURRENT_VER 62 /** * An auxillary macro, used to specify savegame versions. We use this instead |