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/ZCollision.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/ZCollision.cpp')
| -rw-r--r-- | ZAPD/ZCollision.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ZAPD/ZCollision.cpp b/ZAPD/ZCollision.cpp index eb37d71..6e8debb 100644 --- a/ZAPD/ZCollision.cpp +++ b/ZAPD/ZCollision.cpp @@ -95,7 +95,7 @@ void ZCollisionHeader::ParseRawData() if (waterBoxAddress != 0) parent->AddDeclarationArray( - waterBoxSegmentOffset, DeclarationAlignment::None, 16 * waterBoxes.size(), "WaterBox", + waterBoxSegmentOffset, DeclarationAlignment::Align4, 16 * waterBoxes.size(), "WaterBox", StringHelper::Sprintf("%s_waterBoxes_%06X", name.c_str(), waterBoxSegmentOffset), 0, declaration); @@ -116,7 +116,7 @@ void ZCollisionHeader::ParseRawData() if (polyAddress != 0) { parent->AddDeclarationArray( - polySegmentOffset, DeclarationAlignment::None, polygons.size() * 16, + polySegmentOffset, DeclarationAlignment::Align4, polygons.size() * 16, "CollisionPoly", StringHelper::Sprintf("%s_polygons_%08X", name.c_str(), polySegmentOffset), 0, declaration); @@ -135,7 +135,7 @@ void ZCollisionHeader::ParseRawData() if (polyTypeDefAddress != 0) parent->AddDeclarationArray( - polyTypeDefSegmentOffset, DeclarationAlignment::None, polygonTypes.size() * 8, + polyTypeDefSegmentOffset, DeclarationAlignment::Align4, polygonTypes.size() * 8, "SurfaceType", StringHelper::Sprintf("%s_surfaceType_%08X", name.c_str(), polyTypeDefSegmentOffset), 0, declaration); @@ -157,7 +157,7 @@ void ZCollisionHeader::ParseRawData() if (vtxAddress != 0) parent->AddDeclarationArray( - vtxSegmentOffset, DeclarationAlignment::None, vertices.size() * 6, "Vec3s", + vtxSegmentOffset, DeclarationAlignment::Align4, vertices.size() * 6, "Vec3s", StringHelper::Sprintf("%s_vtx_%08X", name.c_str(), vtxSegmentOffset), 0, declaration); @@ -184,8 +184,8 @@ void ZCollisionHeader::ParseRawData() name.c_str(), polyTypeDefSegmentOffset, name.c_str(), camDataSegmentOffset, numWaterBoxes, waterBoxStr); - parent->AddDeclaration(rawDataIndex, DeclarationAlignment::None, DeclarationPadding::Pad16, 44, - GetSourceTypeName(), name, declaration); + parent->AddDeclaration(rawDataIndex, DeclarationAlignment::Align4, 44, GetSourceTypeName(), + name, declaration); } std::string ZCollisionHeader::GetSourceTypeName() const @@ -299,7 +299,7 @@ CameraDataList::CameraDataList(ZFile* parent, const std::string& prefix, } parent->AddDeclarationArray( - rawDataIndex, DeclarationAlignment::None, entries.size() * 8, "CamData", + rawDataIndex, DeclarationAlignment::Align4, entries.size() * 8, "CamData", StringHelper::Sprintf("%s_camDataList_%08X", prefix.c_str(), rawDataIndex), entries.size(), declaration); @@ -322,7 +322,7 @@ CameraDataList::CameraDataList(ZFile* parent, const std::string& prefix, int32_t cameraPosDataIndex = GETSEGOFFSET(cameraPosDataSeg); uint32_t entrySize = numDataTotal * 0x6; parent->AddDeclarationArray( - cameraPosDataIndex, DeclarationAlignment::None, entrySize, "Vec3s", + cameraPosDataIndex, DeclarationAlignment::Align4, entrySize, "Vec3s", StringHelper::Sprintf("%s_camPosData_%08X", prefix.c_str(), cameraPosDataIndex), numDataTotal, declaration); } |