libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 07:53:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SWORD25: Further fixes for package manager

Browse Source 
svn-id: r53243
This commit is contained in:
Eugene Sandulenko 2010-08-14 22:29:17 +00:00
parent 06fc35ffe8
commit 992c504968
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
engines/sword25/package/scummvmpackagemanager.cpp
View File

@ -166,25 +166,25 @@ Common::FSNode BS_ScummVMPackageManager::GetFSNode(const Common::String &FileNam
PathElementArray pathElements = SeparatePath(FileName, _currentDirectory);
// Loop through checking each archive
Common::List<ArchiveEntry>::iterator i;
Common::List<ArchiveEntry *>::iterator i;
for (i = _archiveList.begin(); i != _archiveList.end(); ++i) {
if (i->MountPath.size() > pathElements.size())
if ((*i)->MountPath.size() > pathElements.size())
// The mount path has more subfolder depth than the search entry, so skip it
continue;
// Check the path against that of the archive
PathElementArray::iterator iPath = pathElements.begin();
PathElementArray::iterator iEntry = i->MountPath.begin();
PathElementArray::iterator iEntry = (*i)->MountPath.begin();
for (; iEntry != i->MountPath.end(); ++iEntry, ++iPath) {
for (; iEntry != (*i)->MountPath.end(); ++iEntry, ++iPath) {
if (Common::String(iPath->GetBegin(), iPath->GetEnd()) ==
Common::String(iEntry->GetBegin(), iEntry->GetEnd()))
break;
}
if (iEntry == i->MountPath.end()) {
if (iEntry == (*i)->MountPath.end()) {
// Look into the archive for the desired file
Common::Archive *archiveFolder = i->Archive;
Common::Archive *archiveFolder = (*i)->Archive;
if (archiveFolder->hasFile(FileName)) {
}
@ -211,9 +211,9 @@ bool BS_ScummVMPackageManager::LoadPackage(const Common::String &FileName, const
BS_LOGLN("Package '%s' mounted as '%s'.", FileName.c_str(), MountPosition.c_str());
Common::ArchiveMemberList files;
zipFile->listMembers(files);
debugC(0, "Capacity %d", files.size());
debug(0, "Capacity %d", files.size());
_archiveList.push_back(ArchiveEntry(zipFile, pathElements));
_archiveList.push_back(new ArchiveEntry(zipFile, pathElements));
return true;
}
@ -232,7 +232,7 @@ bool BS_ScummVMPackageManager::LoadDirectoryAsPackage(const Common::String &Dire
return false;
} else {
BS_LOGLN("Directory '%s' mounted as '%s'.", DirectoryName.c_str(), MountPosition.c_str());
_archiveList.push_front(ArchiveEntry(folderArchive, pathElements));
_archiveList.push_front(new ArchiveEntry(folderArchive, pathElements));
return true;
}
}

2
engines/sword25/package/scummvmpackagemanager.h
View File

@ -85,7 +85,7 @@ private:
Common::String _currentDirectory;
Common::FSNode _rootFolder;
Common::List<ArchiveEntry> _archiveList;
Common::List<ArchiveEntry *> _archiveList;
Common::FSNode GetFSNode(const Common::String &FileName);
public: