Simplifies resource handling for the CD version of Kyrandia.

(also less file loading at startup, but more on room change)

svn-id: r23887

1 files changed, 18 insertions, 6 deletions

diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp
index b1e5cd5c54..a2434e42a7 100644
--- a/engines/kyra/resource.cpp
+++ b/engines/kyra/resource.cpp
@@ -69,12 +69,24 @@ Resource::Resource(KyraEngine *engine) {
 		error("invalid game path '%s'", dir.path().c_str());
 	}
 
-	for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
-		Common::String filename = file->name();
-		filename.toUppercase();
-		if (filename.hasSuffix("PAK") || filename.hasSuffix("APK")) {
-			if (!loadPakFile(file->name())) {
-				error("couldn't open pakfile '%s'", file->name().c_str());
+	if (_engine->game() == GI_KYRA1 && (_engine->features() & GF_TALKIE)) {
+		static const char *list[] = {
+			"adl.pak", "col.pak", "finale.pak", "intro1.pak", "intro2.pak", "intro3.pak", "intro4.pak",
+			"misc.pak", "snd.pak", "startup.pak", "xmi.pak", 0
+		};
+
+		for (int i = 0; list[i]; ++i) {
+			if (!loadPakFile(list[i]))
+				error("couldn't open pakfile '%s'", list[i]);
+		}
+	} else {
+		for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
+			Common::String filename = file->name();
+			filename.toUppercase();
+			if (filename.hasSuffix("PAK") || filename.hasSuffix("APK")) {
+				if (!loadPakFile(file->name())) {
+					error("couldn't open pakfile '%s'", file->name().c_str());
+				}
 			}
 		}
 	}