diff options
| author | Nicholas Estelami <NEstelami@users.noreply.github.com> | 2021-01-01 19:33:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-01 19:33:17 -0500 |
| commit | a29291d139764b251536282b3fd716ffa877e3d7 (patch) | |
| tree | 7a54560af880009942410d3cbf5e01ed378e556c /ZAPD/ZRoom/Commands/SetCollisionHeader.cpp | |
| parent | 1bcccef2c5a3fe0d67778e80aabff7d894ab2168 (diff) | |
Added in support for player animations (#40)
* Added in support for Player Animations
* Fixed up a bunch of non matching issues
Diffstat (limited to 'ZAPD/ZRoom/Commands/SetCollisionHeader.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetCollisionHeader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp b/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp index a72d98d..7141abf 100644 --- a/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp +++ b/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp @@ -9,7 +9,7 @@ using namespace std; SetCollisionHeader::SetCollisionHeader(ZRoom* nZRoom, std::vector<uint8_t> rawData, int rawDataIndex) : ZRoomCommand(nZRoom, rawData, rawDataIndex) { segmentOffset = SEG2FILESPACE(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); - collisionHeader = ZCollisionHeader(nZRoom->parent, StringHelper::Sprintf("%sCollisionHeader", nZRoom->GetName().c_str()), rawData, segmentOffset); + collisionHeader = ZCollisionHeader(nZRoom->parent, StringHelper::Sprintf("%sCollisionHeader0x%06X", nZRoom->GetName().c_str(), segmentOffset), rawData, segmentOffset); } string SetCollisionHeader::GenerateSourceCodePass1(string roomName, int baseAddress) @@ -29,7 +29,7 @@ string SetCollisionHeader::GetCommandCName() string SetCollisionHeader::GenerateExterns() { - return StringHelper::Sprintf("extern CollisionHeader %sCollisionHeader0x%06X;\n", zRoom->GetName().c_str(), segmentOffset); + return ""; } RoomCommand SetCollisionHeader::GetRoomCommand() |