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/SetAlternateHeaders.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/SetAlternateHeaders.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp b/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp index d52f423..a01c555 100644 --- a/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp +++ b/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp @@ -3,8 +3,6 @@ #include "../../StringHelper.h" #include "../../ZFile.h" -using namespace std; - SetAlternateHeaders::SetAlternateHeaders(ZRoom* nZRoom, std::vector<uint8_t> rawData, uint32_t rawDataIndex) : ZRoomCommand(nZRoom, rawData, rawDataIndex) @@ -18,9 +16,9 @@ SetAlternateHeaders::SetAlternateHeaders(ZRoom* nZRoom, std::vector<uint8_t> raw _rawDataIndex = rawDataIndex; } -string SetAlternateHeaders::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +std::string SetAlternateHeaders::GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) { - string sourceOutput = ""; + std::string sourceOutput = ""; int32_t numHeaders = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 4; for (int32_t i = 0; i < numHeaders; i++) @@ -37,7 +35,7 @@ string SetAlternateHeaders::GenerateSourceCodePass1(string roomName, uint32_t ba ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), roomName.c_str(), segmentOffset); - string declaration = ""; + std::string declaration = ""; for (int32_t i = 0; i < numHeaders; i++) { @@ -58,17 +56,17 @@ string SetAlternateHeaders::GenerateSourceCodePass1(string roomName, uint32_t ba return sourceOutput; } -size_t SetAlternateHeaders::GetRawDataSize() +size_t SetAlternateHeaders::GetRawDataSize() const { return ZRoomCommand::GetRawDataSize() + 0; } -string SetAlternateHeaders::GetCommandCName() +std::string SetAlternateHeaders::GetCommandCName() const { return "SCmdAltHeaders"; } -RoomCommand SetAlternateHeaders::GetRoomCommand() +RoomCommand SetAlternateHeaders::GetRoomCommand() const { return RoomCommand::SetAlternateHeaders; }
\ No newline at end of file |