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

[vinterstum at users.sourceforge.net]

Revision: 22696
Author:   vinterstum
Date:     2006-05-27 21:08:25 -0700 (Sat, 27 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22696&view=rev

Log Message:
-----------
Kyra.dat wasn't being loaded for the kyra1 demo (which is needed). Fixed.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/resource.cpp
Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp	2006-05-28 03:47:20 UTC (rev 22695)
+++ scummvm/trunk/engines/kyra/resource.cpp	2006-05-28 04:08:25 UTC (rev 22696)
@@ -32,10 +32,6 @@
 Resource::Resource(KyraEngine *engine) {
 	_engine = engine;
 
-	// No PAK files in the demo version
-	if (_engine->features() & GF_DEMO)
-		return;
-
 	// prefetches all PAK Files
 
 	// ugly a hardcoded list
@@ -132,6 +128,17 @@
 	} else if (_engine->game() == GI_KYRA3) {
 		usedFilelist = kyra3Filelist;
 	}
+
+	// we're loading KYRA.DAT here too (but just for Kyrandia 1)
+	if (_engine->game() == GI_KYRA1) {
+		if (!loadPakFile("KYRA.DAT")) {
+			error("couldn't open Kyrandia resource file ('KYRA.DAT') make sure you got one file for your version");
+		}
+	}
+	
+	// We only need kyra.dat for the demo.
+	if (_engine->features() & GF_DEMO)
+		return;
 		
 	if (!usedFilelist)
 		error("no filelist found for this game");
@@ -151,13 +158,6 @@
 			debug(3, "couldn't load file '%s' correctly", usedFilelist[tmp]);
 		}
 	}
-
-	// we're loading KYRA.DAT here too (but just for Kyrandia 1)
-	if (_engine->game() == GI_KYRA1) {
-		if (!loadPakFile("KYRA.DAT")) {
-			error("couldn't open Kyrandia resource file ('KYRA.DAT') make sure you got one file for your version");
-		}
-	}
 }
 
 Resource::~Resource() {


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