diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2021-03-13 00:20:40 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-12 22:20:40 -0500 |
| commit | b7a50c06ecc23f6b17e410cb10a7046ee008a78d (patch) | |
| tree | 8202929e16e70a39cd8156454dc444b8d0bf2cda /ZAPD/ZCollision.cpp | |
| parent | 55718b1090083e1f5e9b1b1cc09ebcb329baa74f (diff) | |
A few bugfixes (#87)
* remove extra %i in ZCutscene
Signed-off-by: angie <angheloalf95@gmail.com>
* Don't extract vertices from a unknown segment.
Signed-off-by: Angie <angheloalf95@gmail.com>
* Fix SurfaceType in CollisionHeader
Signed-off-by: Angie <angheloalf95@gmail.com>
* Fix merge issue
Signed-off-by: angie <angheloalf95@gmail.com>
Diffstat (limited to 'ZAPD/ZCollision.cpp')
| -rw-r--r-- | ZAPD/ZCollision.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ZAPD/ZCollision.cpp b/ZAPD/ZCollision.cpp index ce10c0a..35ecbca 100644 --- a/ZAPD/ZCollision.cpp +++ b/ZAPD/ZCollision.cpp @@ -112,7 +112,7 @@ ZCollisionHeader::ZCollisionHeader(ZFile* parent, const std::string& prefix, con declaration = ""; for (int i = 0; i < polygonTypes.size(); i++) { - declaration += StringHelper::Sprintf(" 0x%08lX, 0x%08lX,", polygonTypes[i] >> 32, polygonTypes[i] & 0xFFFFFFFF); + declaration += StringHelper::Sprintf(" { 0x%08lX, 0x%08lX },", polygonTypes[i] >> 32, polygonTypes[i] & 0xFFFFFFFF); if (i < polygonTypes.size() - 1) declaration += "\n"; @@ -120,7 +120,7 @@ ZCollisionHeader::ZCollisionHeader(ZFile* parent, const std::string& prefix, con if (polyTypeDefAddress != 0) parent->AddDeclarationArray(polyTypeDefSegmentOffset, DeclarationAlignment::None, polygonTypes.size() * 8, - "SurfaceType", StringHelper::Sprintf("%s_polygonTypes_%08X", prefix.c_str(), polyTypeDefSegmentOffset), 0, declaration); + "SurfaceType", StringHelper::Sprintf("%s_surfaceType_%08X", prefix.c_str(), polyTypeDefSegmentOffset), 0, declaration); declaration = ""; @@ -157,7 +157,7 @@ ZCollisionHeader::ZCollisionHeader(ZFile* parent, const std::string& prefix, con absMinX, absMinY, absMinZ, absMaxX, absMaxY, absMaxZ); - declaration += StringHelper::Sprintf(" %i,\n %s_vtx_%08X,\n %i,\n %s_polygons_%08X,\n %s_polygonTypes_%08X,\n &%s_camDataList_%08X,\n %i,\n %s\n", + declaration += StringHelper::Sprintf(" %i,\n %s_vtx_%08X,\n %i,\n %s_polygons_%08X,\n %s_surfaceType_%08X,\n &%s_camDataList_%08X,\n %i,\n %s\n", numVerts, prefix.c_str(), vtxSegmentOffset, numPolygons, prefix.c_str(), polySegmentOffset, prefix.c_str(), polyTypeDefSegmentOffset, prefix.c_str(), camDataSegmentOffset, numWaterBoxes, waterBoxStr); |