[Scummvm-cvs-logs] SF.net SVN: scummvm:[34436] scummvm/trunk/engines/kyra/resource.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Mon Sep 8 00:35:13 CEST 2008


Revision: 34436
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34436&view=rev
Author:   lordhoto
Date:     2008-09-07 22:35:13 +0000 (Sun, 07 Sep 2008)

Log Message:
-----------
- Fixed regression in Resource::unloadPakFile
- Changed priority value for OSystem::addSysArchivesToSearchSet call

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/resource.cpp

Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp	2008-09-07 22:30:34 UTC (rev 34435)
+++ scummvm/trunk/engines/kyra/resource.cpp	2008-09-07 22:35:13 UTC (rev 34436)
@@ -40,7 +40,8 @@
 
 	Common::SharedPtr<Common::Archive> path(new Common::FSDirectory(ConfMan.get("path")));
 	Common::SharedPtr<Common::Archive> extrapath(new Common::FSDirectory(ConfMan.get("extrapath")));
-	_vm->_system->addSysArchivesToSearchSet(_files);
+
+	_vm->_system->addSysArchivesToSearchSet(_files, 3);
 	_files.add("path", path, 3);
 	_files.add("extrapath", extrapath, 3);
 	// compressed installer archives are added at level '2',
@@ -208,7 +209,8 @@
 void Resource::unloadPakFile(Common::String filename) {
 	filename.toUppercase();
 	_archiveFiles->remove(filename);
-	_protectedFiles->remove(filename);
+	// We do not remove files from '_protectedFiles' here, since
+	// those are protected against unloading.
 }
 
 bool Resource::isInPakList(Common::String filename) {


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