AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 14:24:56 +00:00
Code Issues Projects Releases Wiki Activity

Integrate Amuse into hecl cook/extract for MP1/2

Browse Source
This commit is contained in:
Jack Andersen
2018-09-02 14:46:16 -10:00
parent 5a60a0acfc
commit e46ec80b64
150 changed files with 5011 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DataSpec/DNAMP3/DNAMP3.cpp
View File

@@ -92,7 +92,7 @@ void PAKBridge::build()
mlvl.read(rs);
}
bool named;
std::string bestName = m_pak.bestEntryName(entry, named);
std::string bestName = m_pak.bestEntryName(m_node, entry, named);
level.name = hecl::SystemStringConv(bestName).sys_str();
level.areas.reserve(mlvl.areaCount);
unsigned layerIdx = 0;
@@ -260,7 +260,7 @@ void PAKBridge::addMAPATransforms(PAKRouter<PAKBridge>& pakRouter,
}
}
ResExtractor<PAKBridge> PAKBridge::LookupExtractor(const PAK& pak, const PAK::Entry& entry)
ResExtractor<PAKBridge> PAKBridge::LookupExtractor(const nod::Node& pakNode, const PAK& pak, const PAK::Entry& entry)
{
switch (entry.type)
{

2
DataSpec/DNAMP3/DNAMP3.hpp
View File

@@ -22,7 +22,7 @@ public:
PAKBridge(const nod::Node& node, bool doExtract=true);
void build();
static ResExtractor<PAKBridge> LookupExtractor(const PAK& pak, const PAK::Entry& entry);
static ResExtractor<PAKBridge> LookupExtractor(const nod::Node& pakNode, const PAK& pak, const PAK::Entry& entry);
std::string_view getName() const {return m_node.getName();}
hecl::SystemStringView getLevelString() const {return m_levelString;}

2
DataSpec/DNAMP3/PAK.cpp
View File

@@ -243,7 +243,7 @@ const PAK::Entry* PAK::lookupEntry(std::string_view name) const
return nullptr;
}
std::string PAK::bestEntryName(const Entry& entry, bool& named) const
std::string PAK::bestEntryName(const nod::Node& pakNode, const Entry& entry, bool& named) const
{
/* Prefer named entries first */
for (const NameEntry& nentry : m_nameEntries)

2
DataSpec/DNAMP3/PAK.hpp
View File

@@ -64,7 +64,7 @@ struct PAK : BigDNA
const Entry* lookupEntry(const UniqueID64& id) const;
const Entry* lookupEntry(std::string_view name) const;
std::string bestEntryName(const Entry& entry, bool& named) const;
std::string bestEntryName(const nod::Node& pakNode, const Entry& entry, bool& named) const;
bool mreaHasDupeResources(const UniqueID64& id) const
{ return m_dupeMREAs.find(id) != m_dupeMREAs.cend(); }