diff options
| author | Gregory Montoir | 2005-10-18 19:17:19 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2005-10-18 19:17:19 +0000 |
| commit | a38bc21581abedbeb30f371ed079c85cefa98596 (patch) | |
| tree | 689d3b7bd76032b5f295e904abd259948f0ddb6e /scumm/saveload.cpp | |
| parent | e7c8dc025acde517dce149c97a314ae874e213dd (diff) | |
| download | scummvm-rg350-a38bc21581abedbeb30f371ed079c85cefa98596.tar.gz scummvm-rg350-a38bc21581abedbeb30f371ed079c85cefa98596.tar.bz2 scummvm-rg350-a38bc21581abedbeb30f371ed079c85cefa98596.zip | |
Added flood fill support. Pajama2 puzzle seems to be ok now
svn-id: r19158
Diffstat (limited to 'scumm/saveload.cpp')
| -rw-r--r-- | scumm/saveload.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index 833146b74b..e24036971e 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -37,7 +37,6 @@ #include "scumm/scumm.h" #include "scumm/sound.h" #include "scumm/verbs.h" -#include "scumm/wiz_he.h" #include "sound/audiocd.h" #include "sound/mixer.h" @@ -1237,15 +1236,15 @@ void ScummEngine_v70he::saveOrLoad(Serializer *s, uint32 savegameVersion) { void ScummEngine_v90he::saveOrLoad(Serializer *s, uint32 savegameVersion) { ScummEngine_v70he::saveOrLoad(s, savegameVersion); - const SaveLoadEntry floodStateEntries[] = { - MKLINE(FloodStateParameters, box.left, sleInt32, VER(51)), - MKLINE(FloodStateParameters, box.top, sleInt32, VER(51)), - MKLINE(FloodStateParameters, box.right, sleInt32, VER(51)), - MKLINE(FloodStateParameters, box.bottom, sleInt32, VER(51)), - MKLINE(FloodStateParameters, field_10, sleInt32, VER(51)), - MKLINE(FloodStateParameters, field_14, sleInt32, VER(51)), - MKLINE(FloodStateParameters, field_18, sleInt32, VER(51)), - MKLINE(FloodStateParameters, field_1C, sleInt32, VER(51)), + const SaveLoadEntry floodFillEntries[] = { + MKLINE(FloodFillParameters, box.left, sleInt32, VER(51)), + MKLINE(FloodFillParameters, box.top, sleInt32, VER(51)), + MKLINE(FloodFillParameters, box.right, sleInt32, VER(51)), + MKLINE(FloodFillParameters, box.bottom, sleInt32, VER(51)), + MKLINE(FloodFillParameters, x, sleInt32, VER(51)), + MKLINE(FloodFillParameters, y, sleInt32, VER(51)), + MKLINE(FloodFillParameters, flags, sleInt32, VER(51)), + MKLINE(FloodFillParameters, unk1C, sleInt32, VER(51)), MKEND() }; @@ -1262,7 +1261,7 @@ void ScummEngine_v90he::saveOrLoad(Serializer *s, uint32 savegameVersion) { _sprite->saveOrLoadSpriteData(s, savegameVersion); - s->saveLoadArrayOf(&_floodStateParams, 1, sizeof(_floodStateParams), floodStateEntries); + s->saveLoadArrayOf(&_floodFillParams, 1, sizeof(_floodFillParams), floodFillEntries); _numSpritesToProcess = _sprite->_numSpritesToProcess; s->saveLoadEntries(this, HE90Entries); |