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/SetMinimapList.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/SetMinimapList.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetMinimapList.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/ZAPD/ZRoom/Commands/SetMinimapList.cpp b/ZAPD/ZRoom/Commands/SetMinimapList.cpp index 0dd1961..c3e1d53 100644 --- a/ZAPD/ZRoom/Commands/SetMinimapList.cpp +++ b/ZAPD/ZRoom/Commands/SetMinimapList.cpp @@ -5,8 +5,6 @@ #include "../../ZFile.h" #include "../ZRoom.h" -using namespace std; - SetMinimapList::SetMinimapList(ZRoom* nZRoom, std::vector<uint8_t> rawData, uint32_t rawDataIndex) : ZRoomCommand(nZRoom, rawData, rawDataIndex) { @@ -14,7 +12,7 @@ SetMinimapList::SetMinimapList(ZRoom* nZRoom, std::vector<uint8_t> rawData, uint listSegmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, segmentOffset + 0)); unk4 = BitConverter::ToInt32BE(rawData, segmentOffset + 4); - minimaps = vector<MinimapEntry*>(); + minimaps = std::vector<MinimapEntry*>(); int32_t currentPtr = listSegmentOffset; @@ -33,7 +31,7 @@ SetMinimapList::~SetMinimapList() delete entry; } -string SetMinimapList::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +std::string SetMinimapList::GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) { return StringHelper::Sprintf( "%s 0x%02X, (u32)&%sMinimapList0x%06X", @@ -41,9 +39,9 @@ string SetMinimapList::GenerateSourceCodePass1(string roomName, uint32_t baseAdd zRoom->GetName().c_str(), segmentOffset); } -string SetMinimapList::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) +std::string SetMinimapList::GenerateSourceCodePass2(std::string roomName, uint32_t baseAddress) { - string sourceOutput = ""; + std::string sourceOutput = ""; sourceOutput += StringHelper::Sprintf("%s 0, (u32)&%sMinimapList0x%06X };", @@ -51,8 +49,8 @@ string SetMinimapList::GenerateSourceCodePass2(string roomName, uint32_t baseAdd roomName.c_str(), segmentOffset, unk4); { - string declaration = StringHelper::Sprintf("(u32)%sMinimapEntryList0x%06X, 0x%08X", - roomName.c_str(), listSegmentOffset, unk4); + std::string declaration = StringHelper::Sprintf("(u32)%sMinimapEntryList0x%06X, 0x%08X", + roomName.c_str(), listSegmentOffset, unk4); zRoom->parent->AddDeclaration( segmentOffset, DeclarationAlignment::Align4, DeclarationPadding::None, 8, "MinimapList", @@ -61,7 +59,7 @@ string SetMinimapList::GenerateSourceCodePass2(string roomName, uint32_t baseAdd } { - string declaration = ""; + std::string declaration = ""; size_t index = 0; for (MinimapEntry* entry : minimaps) @@ -86,23 +84,23 @@ string SetMinimapList::GenerateSourceCodePass2(string roomName, uint32_t baseAdd return sourceOutput; } -string SetMinimapList::GenerateExterns() +std::string SetMinimapList::GenerateExterns() const { return StringHelper::Sprintf("extern MinimapList %sMinimapList0x%06X;\n", zRoom->GetName().c_str(), listSegmentOffset); } -string SetMinimapList::GetCommandCName() +std::string SetMinimapList::GetCommandCName() const { return "SCmdMinimapSettings"; } -RoomCommand SetMinimapList::GetRoomCommand() +RoomCommand SetMinimapList::GetRoomCommand() const { return RoomCommand::SetMinimapList; } -size_t SetMinimapList::GetRawDataSize() +size_t SetMinimapList::GetRawDataSize() const { return ZRoomCommand::GetRawDataSize() + (minimaps.size() * 10); } |