diff options
author | Willem Jan Palenstijn | 2012-01-15 18:25:00 +0100 |
---|---|---|
committer | Willem Jan Palenstijn | 2012-01-15 18:25:00 +0100 |
commit | 56fb56936e36b3a91ab575a78514383199388ed9 (patch) | |
tree | d3600ad7d0ea29615a2afac4ca247f20ed408e75 /engines/sci/detection.cpp | |
parent | f2c163a5690d20e41ff39245242e7cc0b9eed8eb (diff) | |
download | scummvm-rg350-56fb56936e36b3a91ab575a78514383199388ed9.tar.gz scummvm-rg350-56fb56936e36b3a91ab575a78514383199388ed9.tar.bz2 scummvm-rg350-56fb56936e36b3a91ab575a78514383199388ed9.zip |
SCI: Clean up some memory management and loops
Diffstat (limited to 'engines/sci/detection.cpp')
-rw-r--r-- | engines/sci/detection.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 80f45b4325..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 |