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/SetTransitionActorList.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/SetTransitionActorList.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetTransitionActorList.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp b/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp index 42f53f7..431c1a2 100644 --- a/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp +++ b/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp @@ -6,8 +6,6 @@ #include "../ZNames.h" #include "../ZRoom.h" -using namespace std; - SetTransitionActorList::SetTransitionActorList(ZRoom* nZRoom, std::vector<uint8_t> rawData, uint32_t rawDataIndex) : ZRoomCommand(nZRoom, rawData, rawDataIndex) @@ -15,7 +13,7 @@ SetTransitionActorList::SetTransitionActorList(ZRoom* nZRoom, std::vector<uint8_ int32_t numActors = rawData[rawDataIndex + 1]; segmentOffset = BitConverter::ToInt32BE(rawData, rawDataIndex + 4) & 0x00FFFFFF; - transitionActors = vector<TransitionActorEntry*>(); + transitionActors = std::vector<TransitionActorEntry*>(); uint32_t currentPtr = segmentOffset; @@ -34,22 +32,23 @@ SetTransitionActorList::~SetTransitionActorList() delete actor; } -string SetTransitionActorList::GetSourceOutputCode(std::string prefix) +std::string SetTransitionActorList::GetSourceOutputCode(std::string prefix) { return ""; } -string SetTransitionActorList::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +std::string SetTransitionActorList::GenerateSourceCodePass1(std::string roomName, + uint32_t baseAddress) { - string sourceOutput = + std::string sourceOutput = StringHelper::Sprintf("%s 0x%02X, (u32)%sTransitionActorList0x%06X", ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), transitionActors.size(), roomName.c_str(), segmentOffset); - string declaration = ""; + std::string declaration = ""; for (TransitionActorEntry* entry : transitionActors) { - string actorStr = ZNames::GetActorName(entry->actorNum); + std::string actorStr = ZNames::GetActorName(entry->actorNum); declaration += StringHelper::Sprintf( " { %i, %i, %i, %i, %s, %i, %i, %i, %i, 0x%04X }, \n", entry->frontObjectRoom, @@ -67,28 +66,29 @@ string SetTransitionActorList::GenerateSourceCodePass1(string roomName, uint32_t return sourceOutput; } -string SetTransitionActorList::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) +std::string SetTransitionActorList::GenerateSourceCodePass2(std::string roomName, + uint32_t baseAddress) { return ""; } -size_t SetTransitionActorList::GetRawDataSize() +size_t SetTransitionActorList::GetRawDataSize() const { return ZRoomCommand::GetRawDataSize() + (transitionActors.size() * 16); } -string SetTransitionActorList::GenerateExterns() +std::string SetTransitionActorList::GenerateExterns() const { return StringHelper::Sprintf("extern TransitionActorEntry %sTransitionActorList0x%06X[];\n", zRoom->GetName().c_str(), segmentOffset); } -string SetTransitionActorList::GetCommandCName() +std::string SetTransitionActorList::GetCommandCName() const { return "SCmdTransiActorList"; } -RoomCommand SetTransitionActorList::GetRoomCommand() +RoomCommand SetTransitionActorList::GetRoomCommand() const { return RoomCommand::SetTransitionActorList; } |
