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/kyra/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/kyra/saveload.cpp')
-rw-r--r-- | engines/kyra/saveload.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp index c08967c85c..debf0623ac 100644 --- a/engines/kyra/saveload.cpp +++ b/engines/kyra/saveload.cpp @@ -113,7 +113,10 @@ KyraEngine_v1::kReadSaveHeaderError KyraEngine_v1::readSaveHeader(Common::Seekab if (loadThumbnail) { header.thumbnail = new Graphics::Surface(); assert(header.thumbnail); - Graphics::loadThumbnail(*in, *header.thumbnail); + if (!Graphics::loadThumbnail(*in, *header.thumbnail)) { + delete header.thumbnail; + header.thumbnail = 0; + } } else { Graphics::skipThumbnailHeader(*in); } |