AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-17 04:47:09 +00:00
Code Issues Projects Releases Wiki Activity

Rename all sound groups' group IDs, and fix header importing for SFX and Macro names

Browse Source
This commit is contained in:
Phillip Stephens
2021-11-24 23:01:47 -08:00
parent 5cc2e6bce7
commit 162e85aa2c
72 changed files with 80 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DataSpec/DNAMP1/AGSC.cpp
View File

@@ -181,10 +181,9 @@ bool AGSC::Extract(PAKEntryReadStream& rs, const hecl::ProjectPath& dir) {
group.getSdir().extractAllCompressed(dir.getAbsolutePath(), data.getSamp());
/* Import C headers */
auto lastComp = dir.getLastComponent();
auto search = std::lower_bound(std::cbegin(Headers), std::cend(Headers), lastComp,
auto search = std::lower_bound(std::cbegin(Headers), std::cend(Headers), head.groupName,
[](const auto& a, const auto& b) { return a.first < b; });
if (search != std::cend(Headers) && search->first == lastComp)
if (search != std::cend(Headers) && search->first == head.groupName)
group.importCHeader((char*)search->second);
/* Write out project/pool */
@@ -232,7 +231,13 @@ bool AGSC::Cook(const hecl::ProjectPath& dir, const hecl::ProjectPath& refOutPat
Header head;
head.audioDir = "Audio/"sv;
head.groupName = path.getLastComponent();
auto lastComp = path.getLastComponent();
auto str = fmt::format("_{:8X}", path.parsedHash32());
auto it = lastComp.rfind(str);
if (it != std::string_view::npos) {
lastComp = lastComp.substr(0, it);
}
head.groupName = lastComp;
head.write(w);
amuse::AudioGroupDatabase group(path.getAbsolutePath());