aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorJohannes Schickel2006-07-22 15:21:40 +0000
committerJohannes Schickel2006-07-22 15:21:40 +0000
commit8116b6aab3fca7ee19025be6ec1af6e8f3777df0 (patch)
tree519ce050754f4555e465b5bb86febb07c643d855 /common
parente3ab20ee90cfe1c823a01a545cc0944433e4ad7a (diff)
downloadscummvm-rg350-8116b6aab3fca7ee19025be6ec1af6e8f3777df0.tar.gz
scummvm-rg350-8116b6aab3fca7ee19025be6ec1af6e8f3777df0.tar.bz2
scummvm-rg350-8116b6aab3fca7ee19025be6ec1af6e8f3777df0.zip
Using FilesystemNode::name instead of FilesystemNode::displayName in the fileclass too, then again this doesn't *have* to work. (check FilesystemNode documentation)
svn-id: r23562
Diffstat (limited to 'common')
-rw-r--r--common/file.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/file.cpp b/common/file.cpp
index c71121b241..f8e131a80e 100644
--- a/common/file.cpp
+++ b/common/file.cpp
@@ -146,10 +146,10 @@ void File::addDefaultDirectoryRecursive(const FilesystemNode &dir, int level, co
for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
if (file->isDirectory()) {
- addDefaultDirectoryRecursive(file->path(), level - 1, prefix + file->displayName() + "/");
+ addDefaultDirectoryRecursive(file->path(), level - 1, prefix + file->name() + "/");
} else {
String lfn(prefix);
- lfn += file->displayName();
+ lfn += file->name();
lfn.toLowercase();
if (!_filesMap->contains(lfn)) {
(*_filesMap)[lfn] = file->path();
@@ -277,7 +277,7 @@ bool File::open(const String &filename, AccessMode mode) {
bool File::open(const FilesystemNode &node, AccessMode mode) {
assert(mode == kFileReadMode || mode == kFileWriteMode);
- String filename(node.displayName());
+ String filename(node.name());
if (_handle) {
error("File::open: This file object already is opened (%s), won't open '%s'", _name.c_str(), filename.c_str());