aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/resource.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2007-03-24 00:04:08 +0000
committerJohannes Schickel2007-03-24 00:04:08 +0000
commitd1645e2fbfbf7246de3ab3ca61dea0b4ffe1a296 (patch)
treea4992d087358d688271f4b92083bb0ca09e5261c /engines/kyra/resource.cpp
parentc8c3dd04a780a106905cc9582058099a7ead343f (diff)
downloadscummvm-rg350-d1645e2fbfbf7246de3ab3ca61dea0b4ffe1a296.tar.gz
scummvm-rg350-d1645e2fbfbf7246de3ab3ca61dea0b4ffe1a296.tar.bz2
scummvm-rg350-d1645e2fbfbf7246de3ab3ca61dea0b4ffe1a296.zip
Commit of patch #1686414 ("Kyra: FM-Towns music").
svn-id: r26285
Diffstat (limited to 'engines/kyra/resource.cpp')
-rw-r--r--engines/kyra/resource.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp
index 569a4cf036..e8b6801bc2 100644
--- a/engines/kyra/resource.cpp
+++ b/engines/kyra/resource.cpp
@@ -88,6 +88,11 @@ Resource::Resource(KyraEngine *engine) {
for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
Common::String filename = file->name();
filename.toUppercase();
+
+ // No real PAK file!
+ if (filename == "TWMUSIC.PAK")
+ continue;
+
if (filename.hasSuffix("PAK") || filename.hasSuffix("APK")) {
if (!loadPakFile(file->name())) {
error("couldn't open pakfile '%s'", file->name().c_str());