diff options
author | Adrian Frühwirth | 2018-04-06 00:06:38 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2018-04-07 09:26:20 +0200 |
commit | 00e59a312211c0b49433ad3e9923460ed85edc50 (patch) | |
tree | d604e3f19249c6a6436a83cc868fda9d12e57165 /engines/mortevielle | |
parent | 07775ca71723ddb02de32b840b90742a173dca35 (diff) | |
download | scummvm-rg350-00e59a312211c0b49433ad3e9923460ed85edc50.tar.gz scummvm-rg350-00e59a312211c0b49433ad3e9923460ed85edc50.tar.bz2 scummvm-rg350-00e59a312211c0b49433ad3e9923460ed85edc50.zip |
ALL: Load savegame thumbnail only when necessary
This commit introduces the following changes:
1. Graphics::loadThumbnail()
Now returns a boolean and takes a new argument skipThumbnail which
defaults to false. In case of true, loadThumbnail() reads past the
thumbnail data in the input stream instead of actually loading the
thumbnail. This simplifies savegame handling where, up until now,
many engines always read the whole savegame metadata (including
the thumbnail) and then threw away the thumbnail when not needed
(which is in almost all cases, the most common exception being
MetaEngine::querySaveMetaInfos() which is responsible for loading
savegame metadata for displaying it in the GUI launcher.
2. readSavegameHeader()
Engines which already implement such a method (name varies) now take
a new argument skipThumbnail (default: true) which is passed
through to loadThumbnail(). This means that the default case for
readSavegameHeader() is now _not_ loading the thumbnail from a
savegame and just reading past it. In those cases, e.g.
querySaveMetaInfos(), where we actually are interested in loading
the thumbnail readSavegameHeader() needs to explicitely be called
with skipThumbnail == false.
Engines whose readSavegameHeader() (name varies) already takes an
argument loadThumbnail have been adapted to have a similar
prototype and semantics.
I.e. readSaveHeader(in, loadThumbnail, header) now is
readSaveHeader(in, header, skipThumbnail).
3. Error handling
Engines which previously did not check the return value of
readSavegameHeader() (name varies) now do so ensuring that possibly
broken savegames (be it a broken thumbnail or something else) don't
make it into the GUI launcher list in the first place.
Diffstat (limited to 'engines/mortevielle')
-rw-r--r-- | engines/mortevielle/saveload.cpp | 20 | ||||
-rw-r--r-- | engines/mortevielle/saveload.h | 2 |
2 files changed, 12 insertions, 10 deletions
diff --git a/engines/mortevielle/saveload.cpp b/engines/mortevielle/saveload.cpp index 3032c96690..078338a0b5 100644 --- a/engines/mortevielle/saveload.cpp +++ b/engines/mortevielle/saveload.cpp @@ -92,8 +92,10 @@ bool SavegameManager::loadSavegame(const Common::String &filename) { if (!strncmp(&buffer[0], &SAVEGAME_ID[0], 4)) { // Yes, it is, so skip over the savegame header SavegameHeader header; - readSavegameHeader(stream, header); - delete header.thumbnail; + if (!readSavegameHeader(stream, header)) { + delete stream; + return false; + } } else { stream->seek(0); } @@ -208,9 +210,7 @@ void SavegameManager::writeSavegameHeader(Common::OutSaveFile *out, const Common out->writeSint16LE(td.tm_min); } -bool SavegameManager::readSavegameHeader(Common::InSaveFile *in, SavegameHeader &header) { - header.thumbnail = NULL; - +WARN_UNUSED_RESULT bool SavegameManager::readSavegameHeader(Common::InSaveFile *in, SavegameHeader &header, bool skipThumbnail) { // Get the savegame version header.version = in->readByte(); @@ -221,9 +221,9 @@ bool SavegameManager::readSavegameHeader(Common::InSaveFile *in, SavegameHeader header.saveName += ch; // Get the thumbnail - header.thumbnail = Graphics::loadThumbnail(*in); - if (!header.thumbnail) + if (!Graphics::loadThumbnail(*in, header.thumbnail, skipThumbnail)) { return false; + } // Read in save date/time header.saveYear = in->readSint16LE(); @@ -263,7 +263,6 @@ SaveStateList SavegameManager::listSaves(const Common::String &target) { validFlag = readSavegameHeader(in, header); if (validFlag) { - delete header.thumbnail; saveDescription = header.saveName; } } else if (file->size() == 497) { @@ -311,7 +310,10 @@ SaveStateDescriptor SavegameManager::querySaveMetaInfos(const Common::String &fi } else { // Get the savegame header information SavegameHeader header; - readSavegameHeader(f, header); + if (!readSavegameHeader(f, header, false)) { + delete f; + return SaveStateDescriptor(); + } delete f; // Create the return descriptor diff --git a/engines/mortevielle/saveload.h b/engines/mortevielle/saveload.h index a0de05b920..b401823938 100644 --- a/engines/mortevielle/saveload.h +++ b/engines/mortevielle/saveload.h @@ -65,7 +65,7 @@ public: Common::Error saveGame(int slot); void writeSavegameHeader(Common::OutSaveFile *out, const Common::String &saveName); - static bool readSavegameHeader(Common::InSaveFile *in, SavegameHeader &header); + WARN_UNUSED_RESULT static bool readSavegameHeader(Common::InSaveFile *in, SavegameHeader &header, bool skipThumbnail = true); static SaveStateList listSaves(const Common::String &target); static SaveStateDescriptor querySaveMetaInfos(const Common::String &fileName); }; |