[Scummvm-cvs-logs] SF.net SVN: scummvm: [23562] scummvm/trunk/common/file.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sat Jul 22 17:21:44 CEST 2006


Revision: 23562
Author:   lordhoto
Date:     2006-07-22 08:21:40 -0700 (Sat, 22 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23562&view=rev

Log Message:
-----------
Using FilesystemNode::name instead of FilesystemNode::displayName in the fileclass too, then again this doesn't *have* to work. (check FilesystemNode documentation)

Modified Paths:
--------------
    scummvm/trunk/common/file.cpp
Modified: scummvm/trunk/common/file.cpp
===================================================================
--- scummvm/trunk/common/file.cpp	2006-07-22 15:16:28 UTC (rev 23561)
+++ scummvm/trunk/common/file.cpp	2006-07-22 15:21:40 UTC (rev 23562)
@@ -146,10 +146,10 @@
 
 	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 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());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list