aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine
diff options
context:
space:
mode:
authorMartin Kiewitz2010-07-15 06:04:52 +0000
committerMartin Kiewitz2010-07-15 06:04:52 +0000
commit72faf78b82a6395a058d89f1e349c6831e9517a7 (patch)
treee891fe38f3691ee99c3b012dff1243c40b1ed028 /engines/sci/engine
parent7c210829dd3b4b3078a5c98bda9a7224165daa82 (diff)
downloadscummvm-rg350-72faf78b82a6395a058d89f1e349c6831e9517a7.tar.gz
scummvm-rg350-72faf78b82a6395a058d89f1e349c6831e9517a7.tar.bz2
scummvm-rg350-72faf78b82a6395a058d89f1e349c6831e9517a7.zip
SCI: adding support to qfg4 to import qfg3 character data
svn-id: r50911
Diffstat (limited to 'engines/sci/engine')
-rw-r--r--engines/sci/engine/kfile.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index 27ae7f1493..5c8179103c 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -844,13 +844,15 @@ reg_t kFileIOFindFirst(EngineState *s, int argc, reg_t *argv) {
int attr = argv[2].toUint16(); // We won't use this, Win32 might, though...
debugC(2, kDebugLevelFile, "kFileIO(findFirst): %s, 0x%x", mask.c_str(), attr);
+ // QfG3 uses "/\*.*" for the character import, QfG4 uses "/\*"
+ if (mask.hasPrefix("/\\")) {
+ mask.deleteChar(0);
+ mask.deleteChar(0);
+ }
+
// We remove ".*". mask will get prefixed, so we will return all additional files for that gameid
if (mask == "*.*")
mask = "*";
-
- // QfG3 uses this mask for the character import
- if (mask == "/\\*.*")
- mask = "*";
return s->_dirseeker.firstFile(mask, buf, s->_segMan);
}