AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Linux cook fixes

This commit is contained in:
Jack Andersen 2018-05-05 15:32:53 -10:00
parent 570a6ca57a
commit cc28dc7f0d
4 changed files with 2 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
DataSpec/DNAMP1/MLVL.cpp
View File

@ -54,19 +54,6 @@ bool MLVL::Extract(const SpecBase& dataSpec, PAKEntryReadStream& rs, const hecl:
if (pakRouter.mreaHasDupeResources(area.areaMREAId)) if (pakRouter.mreaHasDupeResources(area.areaMREAId))
athena::io::FileWriter(hecl::ProjectPath(areaDir, _S("!duperes")).getAbsolutePath()); athena::io::FileWriter(hecl::ProjectPath(areaDir, _S("!duperes")).getAbsolutePath());
if (areaIdx == 0)
{
char path[256];
snprintf(path, 256, "/Users/jacko/Desktop/res/orig_%08X.txt", entry.id.toUint32());
FILE* fp = fopen(path, "w");
for (const auto& dep : area.deps)
{
hecl::ProjectPath depPath = pakRouter.getWorking(dep.id);
fprintf(fp, "%s\n", depPath.getRelativePathUTF8().data());
}
fclose(fp);
}
areaIdx++; areaIdx++;
} }

25
DataSpec/SpecMP1.cpp
View File

@ -1283,14 +1283,6 @@ struct SpecMP1 : SpecBase
std::unordered_set<urde::CAssetId> addedTags; std::unordered_set<urde::CAssetId> addedTags;
for (auto& area : mlvl.areas) for (auto& area : mlvl.areas)
{ {
FILE* fp = nullptr;
if (addedTags.empty())
{
char path[256];
snprintf(path, 256, "/Users/jacko/Desktop/res/new_%08X.txt", nameEnt.id.toUint32());
fp = fopen(path, "w");
}
urde::SObjectTag areaTag(FOURCC('MREA'), originalToNew(area.areaMREAId)); urde::SObjectTag areaTag(FOURCC('MREA'), originalToNew(area.areaMREAId));
bool dupeRes = false; bool dupeRes = false;
@ -1338,23 +1330,6 @@ struct SpecMP1 : SpecBase
area.deps = std::move(strippedDeps); area.deps = std::move(strippedDeps);
area.depLayerCount = strippedDepLayers.size(); area.depLayerCount = strippedDepLayers.size();
area.depLayers = std::move(strippedDepLayers); area.depLayers = std::move(strippedDepLayers);
if (fp)
{
//std::unordered_set<urde::CAssetId> tmpAddedTags;
for (const auto& dep : area.deps)
{
urde::CAssetId newId = originalToNew(dep.id);
//if (tmpAddedTags.find(newId) == tmpAddedTags.end())
//{
urde::SObjectTag tag(dep.type, originalToNew(dep.id));
hecl::ProjectPath depPath = pathFromTag(tag);
fprintf(fp, "%s\n", depPath.getRelativePathUTF8().data());
//tmpAddedTags.insert(newId);
//}
}
fclose(fp);
}
} }
urde::SObjectTag nameTag(FOURCC('STRG'), originalToNew(mlvl.worldNameId)); urde::SObjectTag nameTag(FOURCC('STRG'), originalToNew(mlvl.worldNameId));

2
hecl

@ -1 +1 @@
Subproject commit 654d7d39802271fc3d33aa134e07285fbc6f943d Subproject commit 80278ed02e89bb2803bd9a447c9da549332183bb

2
nod

@ -1 +1 @@
Subproject commit 274a63bb306a77cd78527e4fca13d4c69cb5b56e Subproject commit 51a15e474e64575dc2c92249e01e10965fc70de7