diff options
| author | louist103 <35883445+louist103@users.noreply.github.com> | 2021-05-08 12:27:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-08 12:27:38 -0400 |
| commit | a357277e412b5e8f0f2f0578c7d7d213e8744c8d (patch) | |
| tree | 353e7aa38aef392c6f337d6a1a04d3438f00def5 /ZAPD/ZRoom/Commands/SetCollisionHeader.cpp | |
| parent | 547c9b200d1dff745dee694c20a9f9e8e409a11d (diff) | |
Add const to most functions that need it and remove all "using namespace std" (#132)
* started on basic type errors
* Done. For now
* remove libgfxd binary
* const
* no more namespace std
* revert alloca
* re add a few missing consts
Diffstat (limited to 'ZAPD/ZRoom/Commands/SetCollisionHeader.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetCollisionHeader.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp b/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp index 79d2c50..d08a301 100644 --- a/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp +++ b/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp @@ -4,8 +4,6 @@ #include "../../ZFile.h" #include "../ZRoom.h" -using namespace std; - SetCollisionHeader::SetCollisionHeader(ZRoom* nZRoom, std::vector<uint8_t> rawData, uint32_t rawDataIndex) : ZRoomCommand(nZRoom, rawData, rawDataIndex) @@ -19,7 +17,7 @@ SetCollisionHeader::SetCollisionHeader(ZRoom* nZRoom, std::vector<uint8_t> rawDa collisionHeader->ParseRawData(); } -string SetCollisionHeader::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +std::string SetCollisionHeader::GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) { return StringHelper::Sprintf( "%s 0x00, (u32)&%sCollisionHeader0x%06X", @@ -27,22 +25,22 @@ string SetCollisionHeader::GenerateSourceCodePass1(string roomName, uint32_t bas zRoom->GetName().c_str(), segmentOffset); } -string SetCollisionHeader::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) +std::string SetCollisionHeader::GenerateSourceCodePass2(std::string roomName, uint32_t baseAddress) { return ""; } -string SetCollisionHeader::GetCommandCName() +std::string SetCollisionHeader::GetCommandCName() const { return "SCmdColHeader"; } -string SetCollisionHeader::GenerateExterns() +std::string SetCollisionHeader::GenerateExterns() const { return ""; } -RoomCommand SetCollisionHeader::GetRoomCommand() +RoomCommand SetCollisionHeader::GetRoomCommand() const { return RoomCommand::SetCollisionHeader; }
\ No newline at end of file |