diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2021-09-29 14:58:42 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 13:58:42 -0400 |
| commit | 2e7e4c33db92944019cfd8c806054f703629c122 (patch) | |
| tree | 77ad974baa8df0442b9bb165e143b5bffcfcf16d /ZAPD/ZRoom/Commands/SetMesh.cpp | |
| parent | cac62bff64235ec4be71b79443afaa135d739a92 (diff) | |
Remove `DeclarationPadding` and `DeclarationAlignment::None` (#186)
* Nuke DeclarationPadding
* Remove DeclarationAlignment::None
* Fix AddDeclaration memory leaks
* Run formatter
* Remove extra AddDeclarationPlaceholder
* Revert "Remove extra AddDeclarationPlaceholder"
This reverts commit 7a5d6a19d80bb246e0a6c8fde009b2a00a84ef96.
Diffstat (limited to 'ZAPD/ZRoom/Commands/SetMesh.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetMesh.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ZAPD/ZRoom/Commands/SetMesh.cpp b/ZAPD/ZRoom/Commands/SetMesh.cpp index b2f9268..c334082 100644 --- a/ZAPD/ZRoom/Commands/SetMesh.cpp +++ b/ZAPD/ZRoom/Commands/SetMesh.cpp @@ -66,11 +66,9 @@ void GenDListDeclarations(ZRoom* zRoom, ZFile* parent, ZDisplayList* dList) for (const auto& vtxEntry : dList->vtxDeclarations) { - DeclarationAlignment alignment = DeclarationAlignment::Align4; - if (Globals::Instance->game == ZGame::MM_RETAIL) - alignment = DeclarationAlignment::None; parent->AddDeclarationArray( - vtxEntry.first, alignment, dList->vertices[vtxEntry.first].size() * 16, "static Vtx", + vtxEntry.first, DeclarationAlignment::Align16, + dList->vertices[vtxEntry.first].size() * 16, "static Vtx", StringHelper::Sprintf("%sVtx_%06X", zRoom->GetName().c_str(), vtxEntry.first), dList->vertices[vtxEntry.first].size(), vtxEntry.second); } |