aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2005-11-26 05:38:46 +0000
committerTravis Howell2005-11-26 05:38:46 +0000
commit42548e371cba500a9ead2f71d399d098896a82bd (patch)
tree6865fdba33b979b2bdf1a09281944b4b4ac4f25f
parent6d6def10427ac048abbfae590eece78845ce93b2 (diff)
downloadscummvm-rg350-42548e371cba500a9ead2f71d399d098896a82bd.tar.gz
scummvm-rg350-42548e371cba500a9ead2f71d399d098896a82bd.tar.bz2
scummvm-rg350-42548e371cba500a9ead2f71d399d098896a82bd.zip
Add APK packed files to list for CD version.
svn-id: r19702
-rw-r--r--kyra/resource.cpp9
-rw-r--r--kyra/wsamovie.cpp1
2 files changed, 9 insertions, 1 deletions
diff --git a/kyra/resource.cpp b/kyra/resource.cpp
index 3886b88f58..a2ba44e1bf 100644
--- a/kyra/resource.cpp
+++ b/kyra/resource.cpp
@@ -45,6 +45,13 @@ Resource::Resource(KyraEngine* engine) {
};
static const char* kyra1CDFilelist[] = {
+ "ALTAR.APK", "BELROOM.APK", "BONKBG.APK", "BROKEN.APK", "CASTLE.APK", "CAVE.APK", "CGATE.APK",
+ "DEAD.APK", "DNSTAIR.APK", "DRAGON1.APK", "DRAGON2.APK", "EXTPOT.APK", "FORESTA.APK", "FORESTB.APK",
+ "FOUNTN.APK", "FOYER.APK", "GATECV.APK", "GEM.APK", "GEMCUT.APK", "GENHALL.APK", "GLADE.APK",
+ "GRAVE.APK", "HEALER.APK", "LAGOON.APK", "LANDING.APK", "LAVA.APK", "LEPHOLE.APK", "LIBRARY.APK",
+ "MIX.APK", "MOONCAV.APK", "POTION.APK", "SONG.APK", "SORROW.APK", "SPELL.APK", "STUMP.APK",
+ "TEMPLE.APK", "TRUNK.APK", "WILLOW.APK", "XEDGE.APK",
+
"ADL.PAK", "BRINS.PAK", "CLIFF.PAK", "ENTER.PAK", "FORESTA.PAK", "GEM.PAK", "INTRO1.PAK",
"LEPHOLE.PAK", "OAKS.PAK", "SPELL.PAK", "WILLOW.PAK", "ALCHEMY.PAK", "BROKEN.PAK", "COL.PAK",
"EXTHEAL.PAK", "FORESTB.PAK", "GEMCUT.PAK", "INTRO2.PAK", "LIBRARY.PAK", "PLATEAU.PAK", "SPRING.PAK",
@@ -58,7 +65,7 @@ Resource::Resource(KyraEngine* engine) {
"FSOUTHB.PAK", "GRAVE.PAK", "LAGOON.PAK", "NCLIFFB.PAK", "SND.PAK", "TRUNK.PAK", "ZROCK.PAK",
"BONKBG.PAK", "CGATE.PAK", "EDGEB.PAK", "FINALE.PAK", "FWSTSTH.PAK", "GRTHALL.PAK", "LANDING.PAK",
"NWCLIFB.PAK", "SONG.PAK", "UPSTAIR.PAK", "BRIDGE.PAK", "CHASM.PAK", "EMCAV.PAK", "FNORTH.PAK",
- "GATECV.PAK", "HEALER.PAK", "LAVA.PAK", "NWCLIFF.PAK", "SORROW.PAK", "WELL.PAK", 0
+ "GATECV.PAK", "HEALER.PAK", "LAVA.PAK", "NWCLIFF.PAK", "SORROW.PAK", "WELL.PAK", "TRUNK.APK", 0
};
const char** usedFilelist = 0;
diff --git a/kyra/wsamovie.cpp b/kyra/wsamovie.cpp
index 00ba6cec6c..909e457b20 100644
--- a/kyra/wsamovie.cpp
+++ b/kyra/wsamovie.cpp
@@ -32,6 +32,7 @@ WSAMovieV1 *KyraEngine::wsa_open(const char *filename, int offscreenDecode, uint
uint32 flags = 0;
uint32 fileSize;
uint8 *p = _res->fileData(filename, &fileSize);
+ assert(p);
WSAMovieV1 *wsa = new WSAMovieV1;
const uint8 *wsaData = p;