diff options
| author | Travis Howell | 2005-05-28 10:44:27 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-05-28 10:44:27 +0000 |
| commit | 9543d99fc403af22d2c6ec73d6ce1dfb29dbe0c6 (patch) | |
| tree | dde474d2091acdf6307baa98b177cb17258a6ca7 /scumm | |
| parent | 43ca852fdfba0fe10e248b6879525f4529c9e33a (diff) | |
| download | scummvm-rg350-9543d99fc403af22d2c6ec73d6ce1dfb29dbe0c6.tar.gz scummvm-rg350-9543d99fc403af22d2c6ec73d6ce1dfb29dbe0c6.tar.bz2 scummvm-rg350-9543d99fc403af22d2c6ec73d6ce1dfb29dbe0c6.zip | |
Fix load/save game regression in HE90+ games.
svn-id: r18281
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/intern.h | 1 | ||||
| -rw-r--r-- | scumm/saveload.cpp | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index a52d5ec57c..99b2bb2d50 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -1095,6 +1095,7 @@ protected: int32 _curMaxSpriteId; int32 _curSpriteId; int32 _curSpriteGroupId; + int32 _numSpritesToProcess; public: ScummEngine_v90he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex); diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index ab050a7673..a146076988 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -1081,7 +1081,7 @@ void ScummEngine_v90he::saveOrLoad(Serializer *s, uint32 savegameVersion) { MKLINE(ScummEngine_v90he, _curMaxSpriteId, sleInt32, VER(51)), MKLINE(ScummEngine_v90he, _curSpriteId, sleInt32, VER(51)), MKLINE(ScummEngine_v90he, _curSpriteGroupId, sleInt32, VER(51)), - MKLINE(ScummEngine_v90he, _sprite->_numSpritesToProcess, sleInt32, VER(51)), + MKLINE(ScummEngine_v90he, _numSpritesToProcess, sleInt32, VER(51)), MKLINE(ScummEngine_v90he, _heObject, sleInt32, VER(51)), MKLINE(ScummEngine_v90he, _heObjectNum, sleInt32, VER(51)), MKLINE(ScummEngine_v90he, _hePaletteNum, sleInt32, VER(51)), @@ -1091,7 +1091,10 @@ void ScummEngine_v90he::saveOrLoad(Serializer *s, uint32 savegameVersion) { _sprite->saveOrLoadSpriteData(&*s, savegameVersion); s->saveLoadArrayOf(&_floodStateParams, 1, sizeof(_floodStateParams), floodStateEntries); + + _numSpritesToProcess = _sprite->_numSpritesToProcess; s->saveLoadEntries(this, HE90Entries); + _sprite->_numSpritesToProcess = _numSpritesToProcess; if (_heversion >= 99) { s->saveLoadArrayOf(_hePalettes, _numPalettes, sizeof(_hePalettes[0]), sleUint8); |