aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlyssa Milburn2011-08-24 16:17:07 +0200
committerAlyssa Milburn2011-08-24 16:17:07 +0200
commit452280471bcdc17f922b70c94c2c74cfa8033462 (patch)
treed4a059c2abcf11c87bd9fd4bf2f1a3a6ca5f6dea
parentfe64e4bd80fd7a7398440f9bacd89afead8d4033 (diff)
downloadscummvm-rg350-452280471bcdc17f922b70c94c2c74cfa8033462.tar.gz
scummvm-rg350-452280471bcdc17f922b70c94c2c74cfa8033462.tar.bz2
scummvm-rg350-452280471bcdc17f922b70c94c2c74cfa8033462.zip
COMPOSER: Handle Mac-style filenames in paths.
-rw-r--r--engines/composer/composer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp
index 45ca714d8a..538bd94721 100644
--- a/engines/composer/composer.cpp
+++ b/engines/composer/composer.cpp
@@ -294,7 +294,7 @@ Common::String ComposerEngine::mangleFilename(Common::String filename) {
uint slashesToStrip = _directoriesToStrip;
while (slashesToStrip--) {
for (uint i = 0; i < filename.size(); i++) {
- if (filename[i] != '\\')
+ if (filename[i] != '\\' && filename[i] != ':')
continue;
filename = filename.c_str() + i + 1;
break;
@@ -303,7 +303,7 @@ Common::String ComposerEngine::mangleFilename(Common::String filename) {
Common::String outFilename;
for (uint i = 0; i < filename.size(); i++) {
- if (filename[i] == '\\')
+ if (filename[i] == '\\' || filename[i] == ':')
outFilename += '/';
else
outFilename += filename[i];