diff options
| author | D G Turner | 2012-10-12 17:03:32 +0100 |
|---|---|---|
| committer | D G Turner | 2012-10-12 17:03:32 +0100 |
| commit | 151b7beb47ec4b964862d6779bd48e3a33482bbd (patch) | |
| tree | 867717c5266d0908d95edd82560599be20a4ede9 /engines/toon/detection.cpp | |
| parent | 80af0e239473f85c49cc2da3c848dfcde41d4a37 (diff) | |
| parent | 2b55837650c4229dc3d75b660cecfc7a3292e5e0 (diff) | |
| download | scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.tar.gz scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.tar.bz2 scummvm-rg350-151b7beb47ec4b964862d6779bd48e3a33482bbd.zip | |
Merge branch 'master' into teenagentRefactor
Conflicts:
engines/teenagent/callbacks.cpp
Diffstat (limited to 'engines/toon/detection.cpp')
| -rw-r--r-- | engines/toon/detection.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp index 0cafee1475..38b1f4f6e1 100644 --- a/engines/toon/detection.cpp +++ b/engines/toon/detection.cpp @@ -84,7 +84,7 @@ static const ADGameDescription gameDescriptions[] = { {"study.svl", 0, "d4aff126ee27be3c3d25e2996369d7cb", 2324368}, }, Common::RU_RUS, Common::kPlatformPC, ADGF_NO_FLAGS, GUIO0() - }, + }, { "toon", "", { @@ -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 { |