games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00
Code Issues Releases Activity

Always use ResourcePath for referencing images and animations

Browse Source
This commit is contained in:
Ivan Savenko
2023-08-23 15:07:50 +03:00
parent f79492e5b0
commit 823ffa7a07
201 changed files with 1390 additions and 1362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/filesystem/CArchiveLoader.cpp
View File

@@ -78,7 +78,7 @@ void CArchiveLoader::initLODArchive(const std::string &mountPoint, CFileInputStr
entry.compressedSize = reader.readUInt32();
// Add lod entry to local entries map
entries[ResourceID(mountPoint + entry.name)] = entry;
entries[ResourcePath(mountPoint + entry.name)] = entry;
if(extractArchives)
{
@@ -123,7 +123,7 @@ void CArchiveLoader::initVIDArchive(const std::string &mountPoint, CFileInputStr
entry.compressedSize = 0;
offsets.insert(entry.offset);
entries[ResourceID(mountPoint + entry.name)] = entry;
entries[ResourcePath(mountPoint + entry.name)] = entry;
}
offsets.insert(static_cast<int>(fileStream.getSize()));
@@ -162,14 +162,14 @@ void CArchiveLoader::initSNDArchive(const std::string &mountPoint, CFileInputStr
entry.offset = reader.readInt32();
entry.fullSize = reader.readInt32();
entry.compressedSize = 0;
entries[ResourceID(mountPoint + entry.name)] = entry;
entries[ResourcePath(mountPoint + entry.name)] = entry;
if(extractArchives)
extractToFolder("SOUND", fileStream, entry);
}
}
std::unique_ptr<CInputStream> CArchiveLoader::load(const ResourceID & resourceName) const
std::unique_ptr<CInputStream> CArchiveLoader::load(const ResourcePath & resourceName) const
{
assert(existsResource(resourceName));
@@ -187,7 +187,7 @@ std::unique_ptr<CInputStream> CArchiveLoader::load(const ResourceID & resourceNa
}
}
bool CArchiveLoader::existsResource(const ResourceID & resourceName) const
bool CArchiveLoader::existsResource(const ResourcePath & resourceName) const
{
return entries.count(resourceName) != 0;
}
@@ -197,9 +197,9 @@ std::string CArchiveLoader::getMountPoint() const
return mountPoint;
}
std::unordered_set<ResourceID> CArchiveLoader::getFilteredFiles(std::function<bool(const ResourceID &)> filter) const
std::unordered_set<ResourcePath> CArchiveLoader::getFilteredFiles(std::function<bool(const ResourcePath &)> filter) const
{
std::unordered_set<ResourceID> foundID;
std::unordered_set<ResourcePath> foundID;
for(const auto & file : entries)
{
@@ -229,7 +229,7 @@ void CArchiveLoader::extractToFolder(const std::string & outputSubFolder, CInput
void CArchiveLoader::extractToFolder(const std::string & outputSubFolder, const std::string & mountPoint, ArchiveEntry entry) const
{
std::unique_ptr<CInputStream> inputStream = load(ResourceID(mountPoint + entry.name));
std::unique_ptr<CInputStream> inputStream = load(ResourcePath(mountPoint + entry.name));
entry.offset = 0;
extractToFolder(outputSubFolder, *inputStream, entry);