diff options
| author | Matthew Hoops | 2012-08-26 15:49:45 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-08-26 16:12:25 -0400 |
| commit | bb1e60e8b2f3bba06ae3b089097f94ea82a70c8a (patch) | |
| tree | a434233367725fbb6dc7072776c312f52254d57f /engines/toon/detection.cpp | |
| parent | 7a49b3669a0e18210a2f5409cb35da735f549b11 (diff) | |
| parent | 857b92f8ffececa9c1f990d21a6a8d1630199a62 (diff) | |
| download | scummvm-rg350-bb1e60e8b2f3bba06ae3b089097f94ea82a70c8a.tar.gz scummvm-rg350-bb1e60e8b2f3bba06ae3b089097f94ea82a70c8a.tar.bz2 scummvm-rg350-bb1e60e8b2f3bba06ae3b089097f94ea82a70c8a.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
AUTHORS
devtools/credits.pl
gui/credits.h
Diffstat (limited to 'engines/toon/detection.cpp')
| -rw-r--r-- | engines/toon/detection.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp index 8234934972..3877fa2a6c 100644 --- a/engines/toon/detection.cpp +++ b/engines/toon/detection.cpp @@ -133,7 +133,7 @@ public: } virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const { - return detectGameFilebased(allFiles, Toon::fileBasedFallback); + return detectGameFilebased(allFiles, fslist, Toon::fileBasedFallback); } virtual const char *getName() const { @@ -234,9 +234,6 @@ SaveStateDescriptor ToonMetaEngine::querySaveMetaInfos(const char *target, int s Graphics::Surface *const thumbnail = Graphics::loadThumbnail(*file); desc.setThumbnail(thumbnail); - desc.setDeletableFlag(true); - desc.setWriteProtectedFlag(false); - uint32 saveDate = file->readUint32BE(); uint16 saveTime = file->readUint16BE(); |