From e4174711773c7dab12faf870c6d4973a2bdcff0b Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 3 Oct 2008 16:57:40 +0000
Subject: Committed slightly modified patch #2034983 "Case-insensitivy and
 directory handling for engines".

svn-id: r34734
---
 engines/kyra/resource_intern.cpp | 8 ++++----
 engines/kyra/resource_intern.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines/kyra')

diff --git a/engines/kyra/resource_intern.cpp b/engines/kyra/resource_intern.cpp
index f97319a43a..0bec5297ed 100644
--- a/engines/kyra/resource_intern.cpp
+++ b/engines/kyra/resource_intern.cpp
@@ -51,11 +51,11 @@ bool PlainArchive::hasFile(const Common::String &name) {
 	return (_files.find(name) != _files.end());
 }
 
-int PlainArchive::getAllNames(Common::StringList &list) {
+int PlainArchive::listMembers(Common::ArchiveMemberList &list) {
 	int count = 0;
 
 	for (FileMap::const_iterator i = _files.begin(); i != _files.end(); ++i) {
-		list.push_back(i->_key);
+		list.push_back(Common::ArchiveMemberList::value_type(new Common::GenericArchiveMember(i->_key, this)));
 		++count;
 	}
 
@@ -98,11 +98,11 @@ bool CachedArchive::hasFile(const Common::String &name) {
 	return (_files.find(name) != _files.end());
 }
 
-int CachedArchive::getAllNames(Common::StringList &list) {
+int CachedArchive::listMembers(Common::ArchiveMemberList &list) {
 	int count = 0;
 
 	for (FileMap::const_iterator i = _files.begin(); i != _files.end(); ++i) {
-		list.push_back(i->_key);
+		list.push_back(Common::ArchiveMemberList::value_type(new Common::GenericArchiveMember(i->_key, this)));
 		++count;
 	}
 
diff --git a/engines/kyra/resource_intern.h b/engines/kyra/resource_intern.h
index 1335be5e4e..a3fbe9f1f9 100644
--- a/engines/kyra/resource_intern.h
+++ b/engines/kyra/resource_intern.h
@@ -50,7 +50,7 @@ public:
 	PlainArchive(Resource *owner, const Common::String &filename, const FileInputList &files);
 
 	bool hasFile(const Common::String &name);
-	int getAllNames(Common::StringList &list);
+	int listMembers(Common::ArchiveMemberList &list);
 	Common::SeekableReadStream *openFile(const Common::String &name);
 private:
 	struct Entry {
@@ -80,7 +80,7 @@ public:
 	~CachedArchive();
 
 	bool hasFile(const Common::String &name);
-	int getAllNames(Common::StringList &list);
+	int listMembers(Common::ArchiveMemberList &list);
 	Common::SeekableReadStream *openFile(const Common::String &name);
 private:
 	struct Entry {
-- 
cgit v1.2.3