aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/resource.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2006-05-12 23:57:53 +0000
committerJohannes Schickel2006-05-12 23:57:53 +0000
commita5b4fb7f181886ef63bc7982409a7505894ad64d (patch)
tree13d5d45c68d0060a0eb383af5aaa6df8ffd5fc61 /engines/kyra/resource.cpp
parent3623a94927a3d01b6df5c75f42af13a348327c2a (diff)
downloadscummvm-rg350-a5b4fb7f181886ef63bc7982409a7505894ad64d.tar.gz
scummvm-rg350-a5b4fb7f181886ef63bc7982409a7505894ad64d.tar.bz2
scummvm-rg350-a5b4fb7f181886ef63bc7982409a7505894ad64d.zip
- little cleanups
- adds kyra3 dummies svn-id: r22425
Diffstat (limited to 'engines/kyra/resource.cpp')
-rw-r--r--engines/kyra/resource.cpp19
1 files changed, 15 insertions, 4 deletions
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp
index 84dcf39efa..90fbdcf5a3 100644
--- a/engines/kyra/resource.cpp
+++ b/engines/kyra/resource.cpp
@@ -111,6 +111,12 @@ Resource::Resource(KyraEngine *engine) {
"COST2_SH.PAK", "DINOC.PAK", "FOOT.PAK", "INJAIL.PAK", "MISC_CPS.PAK", "PHONE_A.PAK", "SKY.PAK", "VOC.PAK",
"VOLC_K.PAK", 0
};
+
+ static const char *kyra3Filelist[] = {
+ // enough for now
+ "ONETIME.PAK", 0
+ };
+
const char **usedFilelist = 0;
if (_engine->game() == GI_KYRA1) {
@@ -120,8 +126,11 @@ Resource::Resource(KyraEngine *engine) {
usedFilelist = kyra1Filelist;
else if (_engine->features() & GF_TALKIE)
usedFilelist = kyra1CDFilelist;
- } else {
+ } else if (_engine->game() == GI_KYRA2) {
+ // TODO: add kyra2 floppy file list
usedFilelist = kyra2CDFilelist;
+ } else if (_engine->game() == GI_KYRA3) {
+ usedFilelist = kyra3Filelist;
}
if (!usedFilelist)
@@ -143,9 +152,11 @@ Resource::Resource(KyraEngine *engine) {
}
}
- // we're loading KYRA.DAT here too
- if (!loadPakFile("KYRA.DAT")) {
- error("couldn't open Kyrandia resource file ('KYRA.DAT') make sure you got one file for your version");
+ // 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");
+ }
}
}