diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2021-10-01 22:19:47 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-01 21:19:47 -0400 |
| commit | 6b06266eb8d35a7865aa1f942ecbe393e7cde740 (patch) | |
| tree | 6b23ec1617f1ae76f49079ccc9c93c7f4d06eff3 /ZAPD/ZRoom/Commands/SetMesh.cpp | |
| parent | 26b00a2431a70ff190a2b22ee1faf77afa75a034 (diff) | |
Add `--static` flag (#193)
* remove static from every extracted asset
* fix makefile
* Move a bunch of code to Declaration
* make static enablalble
* fix texture static
* clean up
* minor fixes
* Format
* add small docs
* fix
* add table
* add note in the readme
* typo
* maybe_unused
* Add warning to ZSymbol
* format
* fix
Diffstat (limited to 'ZAPD/ZRoom/Commands/SetMesh.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetMesh.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ZAPD/ZRoom/Commands/SetMesh.cpp b/ZAPD/ZRoom/Commands/SetMesh.cpp index c334082..024f054 100644 --- a/ZAPD/ZRoom/Commands/SetMesh.cpp +++ b/ZAPD/ZRoom/Commands/SetMesh.cpp @@ -68,7 +68,7 @@ void GenDListDeclarations(ZRoom* zRoom, ZFile* parent, ZDisplayList* dList) { parent->AddDeclarationArray( vtxEntry.first, DeclarationAlignment::Align16, - dList->vertices[vtxEntry.first].size() * 16, "static Vtx", + dList->vertices[vtxEntry.first].size() * 16, "Vtx", StringHelper::Sprintf("%sVtx_%06X", zRoom->GetName().c_str(), vtxEntry.first), dList->vertices[vtxEntry.first].size(), vtxEntry.second); } @@ -646,8 +646,10 @@ void PolygonType2::DeclareReferences(const std::string& prefix) polyDlistType, polyDListName, polyDLists.size(), declaration); } - parent->AddDeclaration(GETSEGOFFSET(end), DeclarationAlignment::Align4, 4, "static s32", - "terminatorMaybe", "0x01000000"); + parent->AddDeclaration(GETSEGOFFSET(end), DeclarationAlignment::Align4, 4, "s32", + StringHelper::Sprintf("%s_terminatorMaybe_%06X", + parent->GetName().c_str(), GETSEGOFFSET(end)), + "0x01000000"); } std::string PolygonType2::GetBodySourceCode() const |