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

[lordhoto at users.sourceforge.net]

Revision: 30831
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30831&view=rev
Author:   lordhoto
Date:     2008-02-08 10:45:25 -0800 (Fri, 08 Feb 2008)

Log Message:
-----------
- cleanup.
- kyra.dat shouldn't be load by default.

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

Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp	2008-02-08 18:43:13 UTC (rev 30830)
+++ scummvm/trunk/engines/kyra/resource.cpp	2008-02-08 18:45:25 UTC (rev 30831)
@@ -244,18 +244,18 @@
 		temp.close();
 	}
 
-	ResFileMap::iterator iter = _map.find("kyra.dat");
+	ResFileMap::iterator iter = _map.find(StaticResource::staticDataFilename());
 	if (iter == _map.end()) {
-		if (temp.open("kyra.dat")) {
+		if (temp.open(StaticResource::staticDataFilename())) {
 			ResFileEntry entry;
 			entry.parent = "";
 			entry.size = temp.size();
-			entry.loadable = true;
+			entry.loadable = false;
 			entry.preload = false;
 			entry.prot = false;
 			entry.type = ResFileEntry::kPak;
 			entry.offset = 0;
-			_map["kyra.dat"] = entry;
+			_map[StaticResource::staticDataFilename()] = entry;
 			temp.close();
 		}
 	} else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.