diff options
| author | Max Horn | 2004-02-17 00:40:52 +0000 |
|---|---|---|
| committer | Max Horn | 2004-02-17 00:40:52 +0000 |
| commit | 41154fb613fb9b9e27c0cd9cbe09c601c280a75d (patch) | |
| tree | 8a4301d317346c4b575085c185dd46df6a5305d1 /scumm | |
| parent | f219935e83cd49bf1d13692a914827b39cf29a9d (diff) | |
| download | scummvm-rg350-41154fb613fb9b9e27c0cd9cbe09c601c280a75d.tar.gz scummvm-rg350-41154fb613fb9b9e27c0cd9cbe09c601c280a75d.tar.bz2 scummvm-rg350-41154fb613fb9b9e27c0cd9cbe09c601c280a75d.zip | |
save talkVolume
svn-id: r12919
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/actor.cpp | 1 | ||||
| -rw-r--r-- | scumm/saveload.cpp | 2 | ||||
| -rw-r--r-- | scumm/saveload.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index a5270c5827..fd81b87c28 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -1744,6 +1744,7 @@ const SaveLoadEntry *Actor::getSaveLoadEntries() { MKLINE(Actor, talkColor, sleByte, VER(8)), MKLINE(Actor, talkFrequency, sleInt16, VER(16)), MKLINE(Actor, talkPan, sleInt16, VER(24)), + MKLINE(Actor, talkVolume, sleInt16, VER(29)), MKLINE(Actor, scalex, sleByte, VER(8)), MKLINE(Actor, scaley, sleByte, VER(8)), MKLINE(Actor, charset, sleByte, VER(8)), diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index 424f1c07d7..58adfa8289 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -183,7 +183,7 @@ bool ScummEngine::loadState(int slot, bool compat, SaveFileManager *mgr) { // scumm vars. We now know the proper locations. To be able to properly use // old save games, we update the old (bad) variables to the new (correct) // ones. - if (hdr.ver <= 27 && _version == 8) { + if (hdr.ver < 28 && _version == 8) { _scummVars[VAR_CAMERA_MIN_X] = _scummVars[101]; _scummVars[VAR_CAMERA_MAX_X] = _scummVars[102]; _scummVars[VAR_CAMERA_MIN_Y] = _scummVars[103]; diff --git a/scumm/saveload.h b/scumm/saveload.h index da76a4ba0f..f071174619 100644 --- a/scumm/saveload.h +++ b/scumm/saveload.h @@ -32,7 +32,7 @@ namespace Scumm { // Can be useful for other ports too :) #define VER(x) x -#define CURRENT_VER 28 +#define CURRENT_VER 29 // To work around a warning in GCC 3.2 (and 3.1 ?) regarding non-POD types, // we use a small trick: instead of 0 we use 42. Why? Well, it seems newer GCC |