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

[sev at users.sourceforge.net]

Revision: 52120
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52120&view=rev
Author:   sev
Date:     2010-08-16 13:00:41 +0000 (Mon, 16 Aug 2010)

Log Message:
-----------
OSYSTEM: Fix file archive for non-flat directories

Modified Paths:
--------------
    scummvm/trunk/common/fs.cpp

Modified: scummvm/trunk/common/fs.cpp
===================================================================
--- scummvm/trunk/common/fs.cpp	2010-08-16 12:20:12 UTC (rev 52119)
+++ scummvm/trunk/common/fs.cpp	2010-08-16 13:00:41 UTC (rev 52120)
@@ -314,7 +314,11 @@
 	NodeCache::iterator it = _fileCache.begin();
 	for ( ; it != _fileCache.end(); ++it) {
 		if (it->_key.matchString(lowercasePattern, false, true)) {
-			list.push_back(ArchiveMemberPtr(new FSNode(it->_value)));
+			if (_flat)
+				list.push_back(ArchiveMemberPtr(new FSNode(it->_value)));
+			else
+				list.push_back(ArchiveMemberPtr(new FSNode(it->_key)));
+
 			matches++;
 		}
 	}
@@ -330,7 +334,11 @@
 
 	int files = 0;
 	for (NodeCache::iterator it = _fileCache.begin(); it != _fileCache.end(); ++it) {
-		list.push_back(ArchiveMemberPtr(new FSNode(it->_value)));
+		if (_flat)
+			list.push_back(ArchiveMemberPtr(new FSNode(it->_value)));
+		else
+			list.push_back(ArchiveMemberPtr(new FSNode(it->_key)));
+
 		++files;
 	}
 


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