diff options
| author | Christopher Leggett <chris@leggett.dev> | 2023-05-07 22:54:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-07 22:54:54 -0400 |
| commit | b166bdd3fc2ed22df7369c14f251a205b03f22fb (patch) | |
| tree | 54818cf9ca1112826dd153617794df5eaa029d80 | |
| parent | f5aacaf38b87f9f4e5ef82406f5c38ba6e529843 (diff) | |
Reverts part of PR #2851 that required OTR regen. (#2856)
| -rw-r--r-- | OTRExporter/OTRExporter/CollisionExporter.cpp | 2 | ||||
| -rw-r--r-- | soh/soh/resource/importer/CollisionHeaderFactory.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OTRExporter/OTRExporter/CollisionExporter.cpp b/OTRExporter/OTRExporter/CollisionExporter.cpp index f773741f3..3aab347b3 100644 --- a/OTRExporter/OTRExporter/CollisionExporter.cpp +++ b/OTRExporter/OTRExporter/CollisionExporter.cpp @@ -41,8 +41,8 @@ void OTRExporter_Collision::Save(ZResource* res, const fs::path& outPath, Binary writer->Write((uint32_t)col->PolygonTypes.size()); for (uint16_t i = 0; i < col->PolygonTypes.size(); i++) { - writer->Write(col->PolygonTypes[i].data[0]); writer->Write(col->PolygonTypes[i].data[1]); + writer->Write(col->PolygonTypes[i].data[0]); } writer->Write((uint32_t)col->camData->entries.size()); diff --git a/soh/soh/resource/importer/CollisionHeaderFactory.cpp b/soh/soh/resource/importer/CollisionHeaderFactory.cpp index dbf1390df..a935ed7fd 100644 --- a/soh/soh/resource/importer/CollisionHeaderFactory.cpp +++ b/soh/soh/resource/importer/CollisionHeaderFactory.cpp @@ -77,8 +77,8 @@ void Ship::CollisionHeaderFactoryV0::ParseFileBinary(std::shared_ptr<BinaryReade for (uint32_t i = 0; i < collisionHeader->surfaceTypesCount; i++) { SurfaceType surfaceType; - surfaceType.data[0] = reader->ReadUInt32(); surfaceType.data[1] = reader->ReadUInt32(); + surfaceType.data[0] = reader->ReadUInt32(); collisionHeader->surfaceTypes.push_back(surfaceType); } |