aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2013-10-02 00:45:29 +0300
committerFilippos Karapetis2013-10-02 00:45:29 +0300
commitdb5ff22410aa8d649b7c5afa443253526df62991 (patch)
treeb1174da1b8164a242e5978efad893e7fbe199273 /engines
parenta97907241051b493875950285f858c6e215238e3 (diff)
downloadscummvm-rg350-db5ff22410aa8d649b7c5afa443253526df62991.tar.gz
scummvm-rg350-db5ff22410aa8d649b7c5afa443253526df62991.tar.bz2
scummvm-rg350-db5ff22410aa8d649b7c5afa443253526df62991.zip
WINTERMUTE: Handle invalid file access in Carol Reed 6: Black Circle
Diffstat (limited to 'engines')
-rw-r--r--engines/wintermute/base/file/base_disk_file.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index d15778c7cd..808dc9e00d 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -117,6 +117,8 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
if (fixedFilename.contains(':')) {
if (fixedFilename.hasPrefix("c:/windows/fonts/")) { // East Side Story refers to "c:\windows\fonts\framd.ttf"
fixedFilename = filename.c_str() + 14;
+ } else if (fixedFilename.hasPrefix("c:/carol6/svn/data/")) { // Carol Reed 6: Black Circle refers to "c:\carol6\svn\data\sprites\system\help.png"
+ fixedFilename = fixedFilename.c_str() + 19;
} else {
error("openDiskFile::Absolute path or invalid filename used in %s", filename.c_str());
}