diff options
| author | Johannes Schickel | 2008-08-20 14:24:16 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-08-20 14:24:16 +0000 |
| commit | 9138128f5cee660184ce57b645644d341241918a (patch) | |
| tree | 227f5b9fc2bab3ac30d85d545b615efbf0f9137e /engines/scumm/saveload.cpp | |
| parent | f4fc8c3e4c1621e8c40392881a6c647f9915fa38 (diff) | |
| download | scummvm-rg350-9138128f5cee660184ce57b645644d341241918a.tar.gz scummvm-rg350-9138128f5cee660184ce57b645644d341241918a.tar.bz2 scummvm-rg350-9138128f5cee660184ce57b645644d341241918a.zip | |
- Committed Max' compressed save backseeking support from patch #2050337 "KYRA/SCUMM: Thumbnail support/improvement"
- Extended SCUMM engine to support savegames without thumbnail header. (Increased savegame version to prevent saves to be loaded from older ScummVM versions)
- Fixed KYRA to properly support savegames without thumbnail header.
svn-id: r34054
Diffstat (limited to 'engines/scumm/saveload.cpp')
| -rw-r--r-- | engines/scumm/saveload.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index 54dfca9eea..c7193a55f3 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -184,18 +184,8 @@ bool ScummEngine::loadState(int slot, bool compat) { } // Since version 52 a thumbnail is saved directly after the header. - if (hdr.ver >= VER(52)) { - uint32 type = in->readUint32BE(); - // Check for the THMB header. Also, work around a bug which caused - // the chunk type (incorrectly) to be written in LE on LE machines. - if (! (type == MKID_BE('THMB') || (hdr.ver < VER(55) && type == MKID_BE('BMHT')))){ - warning("Can not load thumbnail"); - delete in; - return false; - } - uint32 size = in->readUint32BE(); - in->skip(size - 8); - } + if (hdr.ver >= VER(52)) + skipThumbnailHeader(in); // Since version 56 we save additional information about the creation of // the save game and the save time. |