aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/resource.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2008-04-19 14:36:26 +0000
committerJohannes Schickel2008-04-19 14:36:26 +0000
commit1d6af7b5024f9eaf5bbce1c398e6160ac465fa43 (patch)
tree12d514b60ed5d82740290d8f0db243ec140f3521 /engines/kyra/resource.cpp
parent7e12a50bed6cb18d6240d30eee6fb5a5a0aa7130 (diff)
downloadscummvm-rg350-1d6af7b5024f9eaf5bbce1c398e6160ac465fa43.tar.gz
scummvm-rg350-1d6af7b5024f9eaf5bbce1c398e6160ac465fa43.tar.bz2
scummvm-rg350-1d6af7b5024f9eaf5bbce1c398e6160ac465fa43.zip
Fixed Resource::isInPakList behavior.
svn-id: r31573
Diffstat (limited to 'engines/kyra/resource.cpp')
-rw-r--r--engines/kyra/resource.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp
index c3cecf1a22..dda6664896 100644
--- a/engines/kyra/resource.cpp
+++ b/engines/kyra/resource.cpp
@@ -254,7 +254,12 @@ void Resource::unloadPakFile(const Common::String &filename) {
}
bool Resource::isInPakList(const Common::String &filename) {
- return isAccessable(filename);
+ if (!isAccessable(filename))
+ return false;
+ ResFileMap::iterator iter = _map.find(filename);
+ if (iter == _map.end())
+ return false;
+ return iter->_value.parent.empty();
}
void Resource::unloadAllPakFiles() {