aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/base/base_file_manager.cpp
diff options
context:
space:
mode:
authorjammm2015-02-22 02:02:41 +0530
committerjammm2015-02-22 02:54:45 +0530
commit6ca8d22fb100f2b3f3549b8785801ffd470135b9 (patch)
tree397f7628a22335d06936ad4a54c33962714a2ff9 /engines/wintermute/base/base_file_manager.cpp
parent4f6f0fb148133df632104071185efa049c7d5fea (diff)
downloadscummvm-rg350-6ca8d22fb100f2b3f3549b8785801ffd470135b9.tar.gz
scummvm-rg350-6ca8d22fb100f2b3f3549b8785801ffd470135b9.tar.bz2
scummvm-rg350-6ca8d22fb100f2b3f3549b8785801ffd470135b9.zip
WINTERMUTE: Fixed parentFolder name check when testing for "language"/"languages", Fix bug #6655 (Dead City - hotspot text issue)
Fixed Wintermute incorretly parsing folder names with trailing \ (Windows-only issue) It seems that calling getParent returns trailing '\' which is absent on POSIX based file systems but not on Windows. This causes Wintermute to load outline_red2.font from russian.dcp, which is not desired. This is fixed by calling it->getName() directly, which returns the folder name (without the trailing '\').
Diffstat (limited to 'engines/wintermute/base/base_file_manager.cpp')
-rw-r--r--engines/wintermute/base/base_file_manager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index 58684b66a0..05830ffcd8 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -227,7 +227,7 @@ bool BaseFileManager::registerPackages() {
// Again, make the parent's name all lowercase to avoid any case
// issues.
- Common::String parentName = fileIt->getParent().getName();
+ Common::String parentName = it->getName();
parentName.toLowercase();
// Avoid registering all the language files