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/engine/features.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/engine/features.cpp')
| -rw-r--r-- | engines/sci/engine/features.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/sci/engine/features.cpp b/engines/sci/engine/features.cpp index a5c1b970f1..b3cfee873c 100644 --- a/engines/sci/engine/features.cpp +++ b/engines/sci/engine/features.cpp @@ -430,19 +430,16 @@ SciVersion GameFeatures::detectMessageFunctionType() { return _messageFunctionType; } - Common::List<ResourceId> *resources = g_sci->getResMan()->listResources(kResourceTypeMessage, -1); - - if (resources->empty()) { - delete resources; + Common::List<ResourceId> resources = g_sci->getResMan()->listResources(kResourceTypeMessage, -1); + if (resources.empty()) { // No messages found, so this doesn't really matter anyway... _messageFunctionType = SCI_VERSION_1_1; return _messageFunctionType; } - Resource *res = g_sci->getResMan()->findResource(*resources->begin(), false); + Resource *res = g_sci->getResMan()->findResource(*resources.begin(), false); assert(res); - delete resources; // Only v2 Message resources use the kGetMessage kernel function. // v3-v5 use the kMessage kernel function. |