diff options
Diffstat (limited to 'engines/sci/detection.cpp')
| -rw-r--r-- | engines/sci/detection.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 2d567a7fde..c43849056b 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -303,29 +303,29 @@ Common::String convertSierraGameId(Common::String sierraId, uint32 *gameFlags, R if (sierraId == "fp" || sierraId == "gk" || sierraId == "pq4") demoThreshold = 150; - Common::ScopedPtr<Common::List<ResourceId> > resources(resMan.listResources(kResourceTypeScript, -1)); - if (resources->size() < demoThreshold) { + Common::List<ResourceId> resources = resMan.listResources(kResourceTypeScript, -1); + if (resources.size() < demoThreshold) { *gameFlags |= ADGF_DEMO; // Crazy Nick's Picks - if (sierraId == "lsl1" && resources->size() == 34) + if (sierraId == "lsl1" && resources.size() == 34) return "cnick-lsl"; - if (sierraId == "sq4" && resources->size() == 34) + if (sierraId == "sq4" && resources.size() == 34) return "cnick-sq"; - if (sierraId == "hoyle3" && resources->size() == 42) + if (sierraId == "hoyle3" && resources.size() == 42) return "cnick-kq"; - if (sierraId == "rh budget" && resources->size() == 39) + if (sierraId == "rh budget" && resources.size() == 39) return "cnick-longbow"; // TODO: cnick-laurabow (the name of the game object contains junk) // Handle Astrochicken 1 (SQ3) and 2 (SQ4) - if (sierraId == "sq3" && resources->size() == 20) + if (sierraId == "sq3" && resources.size() == 20) return "astrochicken"; if (sierraId == "sq4") return "msastrochicken"; } - if (sierraId == "torin" && resources->size() == 226) // Torin's Passage demo + if (sierraId == "torin" && resources.size() == 226) // Torin's Passage demo *gameFlags |= ADGF_DEMO; for (const OldNewIdTableEntry *cur = s_oldNewTable; cur->oldId[0]; ++cur) { @@ -350,7 +350,7 @@ Common::String convertSierraGameId(Common::String sierraId, uint32 *gameFlags, R return "qfg4"; // qfg4 demo has less than 50 scripts - if (resources->size() < 50) + if (resources.size() < 50) return "qfg4"; // Otherwise it's qfg3 @@ -373,7 +373,7 @@ static ADGameDescription s_fallbackDesc = { Common::UNK_LANG, Common::kPlatformPC, ADGF_NO_FLAGS, - GUIO1(GUIO_NONE) + GUIO0() }; static char s_fallbackGameIdBuf[256]; @@ -435,7 +435,7 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const FileMap &allFiles, s_fallbackDesc.flags = ADGF_NO_FLAGS; s_fallbackDesc.platform = Common::kPlatformPC; // default to PC platform s_fallbackDesc.gameid = "sci"; - s_fallbackDesc.guioptions = GUIO1(GUIO_NONE); + s_fallbackDesc.guioptions = GUIO0(); if (allFiles.contains("resource.map") || allFiles.contains("Data1") || allFiles.contains("resmap.001") || allFiles.contains("resmap.001")) { |