diff options
author | Paul Gilbert | 2011-10-01 17:50:19 +1000 |
---|---|---|
committer | Paul Gilbert | 2011-10-01 17:50:19 +1000 |
commit | 9bb978486b102dc751922c6d5f4e729e264c2887 (patch) | |
tree | 65a5b4603f3f9c3376eed9fde8034f170ecb5ede /engines/tsage/detection.cpp | |
parent | 8465f9f99ff5eca617a57b4231efdbcf7c9f9e8a (diff) | |
download | scummvm-rg350-9bb978486b102dc751922c6d5f4e729e264c2887.tar.gz scummvm-rg350-9bb978486b102dc751922c6d5f4e729e264c2887.tar.bz2 scummvm-rg350-9bb978486b102dc751922c6d5f4e729e264c2887.zip |
COMMON: Fix multiple engines asserting in querySaveMetaInfos for empty save slots
Diffstat (limited to 'engines/tsage/detection.cpp')
-rw-r--r-- | engines/tsage/detection.cpp | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/engines/tsage/detection.cpp b/engines/tsage/detection.cpp index 8a4b834f46..3395205234 100644 --- a/engines/tsage/detection.cpp +++ b/engines/tsage/detection.cpp @@ -156,22 +156,25 @@ public: SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const { Common::InSaveFile *f = g_system->getSavefileManager()->openForLoading( generateGameStateFileName(target, slot)); - assert(f); + + if (f) { + TsAGE::tSageSavegameHeader header; + TsAGE::Saver::readSavegameHeader(f, header); + delete f; + + // Create the return descriptor + SaveStateDescriptor desc(slot, header.saveName); + desc.setDeletableFlag(true); + desc.setWriteProtectedFlag(false); + desc.setThumbnail(header.thumbnail); + desc.setSaveDate(header.saveYear, header.saveMonth, header.saveDay); + desc.setSaveTime(header.saveHour, header.saveMinutes); + desc.setPlayTime(header.totalFrames * GAME_FRAME_TIME); + + return desc; + } - TsAGE::tSageSavegameHeader header; - TsAGE::Saver::readSavegameHeader(f, header); - delete f; - - // Create the return descriptor - SaveStateDescriptor desc(slot, header.saveName); - desc.setDeletableFlag(true); - desc.setWriteProtectedFlag(false); - desc.setThumbnail(header.thumbnail); - desc.setSaveDate(header.saveYear, header.saveMonth, header.saveDay); - desc.setSaveTime(header.saveHour, header.saveMinutes); - desc.setPlayTime(header.totalFrames * GAME_FRAME_TIME); - - return desc; + return SaveStateDescriptor(); } }; |