[Scummvm-cvs-logs] SF.net SVN: scummvm: [31573] scummvm/trunk/engines/kyra/resource.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sat Apr 19 16:36:26 CEST 2008
Revision: 31573
http://scummvm.svn.sourceforge.net/scummvm/?rev=31573&view=rev
Author: lordhoto
Date: 2008-04-19 07:36:26 -0700 (Sat, 19 Apr 2008)
Log Message:
-----------
Fixed Resource::isInPakList behavior.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/resource.cpp
Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp 2008-04-19 14:31:10 UTC (rev 31572)
+++ scummvm/trunk/engines/kyra/resource.cpp 2008-04-19 14:36:26 UTC (rev 31573)
@@ -254,7 +254,12 @@
}
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() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list