summaryrefslogtreecommitdiff
path: root/ZAPD/ZRoom/Commands/SetEntranceList.cpp
diff options
context:
space:
mode:
authorlouist103 <35883445+louist103@users.noreply.github.com>2021-05-08 12:27:38 -0400
committerGitHub <noreply@github.com>2021-05-08 12:27:38 -0400
commita357277e412b5e8f0f2f0578c7d7d213e8744c8d (patch)
tree353e7aa38aef392c6f337d6a1a04d3438f00def5 /ZAPD/ZRoom/Commands/SetEntranceList.cpp
parent547c9b200d1dff745dee694c20a9f9e8e409a11d (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/SetEntranceList.cpp')
-rw-r--r--ZAPD/ZRoom/Commands/SetEntranceList.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/ZAPD/ZRoom/Commands/SetEntranceList.cpp b/ZAPD/ZRoom/Commands/SetEntranceList.cpp
index e4b3791..2c97902 100644
--- a/ZAPD/ZRoom/Commands/SetEntranceList.cpp
+++ b/ZAPD/ZRoom/Commands/SetEntranceList.cpp
@@ -5,13 +5,11 @@
#include "../ZRoom.h"
#include "SetStartPositionList.h"
-using namespace std;
-
SetEntranceList::SetEntranceList(ZRoom* nZRoom, std::vector<uint8_t> rawData, uint32_t rawDataIndex)
: ZRoomCommand(nZRoom, rawData, rawDataIndex)
{
segmentOffset = BitConverter::ToInt32BE(rawData, rawDataIndex + 4) & 0x00FFFFFF;
- entrances = vector<EntranceEntry*>();
+ entrances = std::vector<EntranceEntry*>();
_rawData = rawData;
_rawDataIndex = rawDataIndex;
@@ -23,9 +21,9 @@ SetEntranceList::~SetEntranceList()
delete entry;
}
-string SetEntranceList::GenerateSourceCodePass1(string roomName, uint32_t baseAddress)
+std::string SetEntranceList::GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress)
{
- string sourceOutput =
+ std::string sourceOutput =
StringHelper::Sprintf("%s 0x00, (u32)&%sEntranceList0x%06X",
ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(),
zRoom->GetName().c_str(), segmentOffset);
@@ -43,7 +41,7 @@ string SetEntranceList::GenerateSourceCodePass1(string roomName, uint32_t baseAd
currentPtr += 2;
}
- string declaration = "";
+ std::string declaration = "";
int32_t index = 0;
@@ -63,18 +61,18 @@ string SetEntranceList::GenerateSourceCodePass1(string roomName, uint32_t baseAd
return sourceOutput;
}
-string SetEntranceList::GenerateExterns()
+std::string SetEntranceList::GenerateExterns() const
{
return StringHelper::Sprintf("extern EntranceEntry %sEntranceList0x%06X[];\n",
zRoom->GetName().c_str(), segmentOffset);
}
-string SetEntranceList::GetCommandCName()
+std::string SetEntranceList::GetCommandCName() const
{
return "SCmdEntranceList";
}
-RoomCommand SetEntranceList::GetRoomCommand()
+RoomCommand SetEntranceList::GetRoomCommand() const
{
return RoomCommand::SetEntranceList;
}