AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-16 15:37:01 +00:00
Code Issues Projects Releases Wiki Activity

Explicit Asset ID refactor

Browse Source
This commit is contained in:
Jack Andersen
2019-09-30 21:38:03 -10:00
parent c7ffe725ae
commit 16ca0d24c2
113 changed files with 1782 additions and 2057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
DataSpec/DNAMP1/PAK.cpp
View File

@@ -156,27 +156,27 @@ const PAK::Entry* PAK::lookupEntry(std::string_view name) const {
return nullptr;
}
std::string PAK::bestEntryName(const nod::Node& pakNode, const Entry& entry, bool& named) const {
std::string PAK::bestEntryName(const nod::Node& pakNode, const Entry& entry, std::string& catalogueName) const {
std::unordered_map<UniqueID32, Entry>::const_iterator search;
if (entry.type == FOURCC('AGSC') && (search = m_entries.find(entry.id)) != m_entries.cend()) {
/* Use internal AGSC name for entry */
auto rs = search->second.beginReadStream(pakNode);
AGSC::Header header;
header.read(rs);
named = true;
return header.groupName;
catalogueName = header.groupName;
return fmt::format(fmt("{}_{}"), header.groupName, entry.id);
}
/* Prefer named entries first */
for (const NameEntry& nentry : m_nameEntries)
for (const NameEntry& nentry : m_nameEntries) {
if (nentry.id == entry.id) {
named = true;
return nentry.name;
catalogueName = nentry.name;
return fmt::format(fmt("{}_{}"), nentry.name, entry.id);
}
}
/* Otherwise return ID format string */
named = false;
return entry.type.toString() + '_' + entry.id.toString();
return fmt::format(fmt("{}_{}"), entry.type, entry.id);
}
} // namespace DataSpec::DNAMP1