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/SetLightingSettings.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/SetLightingSettings.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetLightingSettings.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/ZAPD/ZRoom/Commands/SetLightingSettings.cpp b/ZAPD/ZRoom/Commands/SetLightingSettings.cpp index de9448d..53b4711 100644 --- a/ZAPD/ZRoom/Commands/SetLightingSettings.cpp +++ b/ZAPD/ZRoom/Commands/SetLightingSettings.cpp @@ -4,8 +4,6 @@ #include "../../ZFile.h" #include "../ZRoom.h" -using namespace std; - SetLightingSettings::SetLightingSettings(ZRoom* nZRoom, std::vector<uint8_t> rawData, uint32_t rawDataIndex) : ZRoomCommand(nZRoom, rawData, rawDataIndex) @@ -18,7 +16,7 @@ SetLightingSettings::SetLightingSettings(ZRoom* nZRoom, std::vector<uint8_t> raw if (numLights > 0) { - string declaration = ""; + std::string declaration = ""; for (int32_t i = 0; i < numLights; i++) { @@ -51,7 +49,7 @@ SetLightingSettings::~SetLightingSettings() delete setting; } -string SetLightingSettings::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +std::string SetLightingSettings::GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) { return StringHelper::Sprintf( "%s %i, (u32)&%sLightSettings_%06X", @@ -59,28 +57,28 @@ string SetLightingSettings::GenerateSourceCodePass1(string roomName, uint32_t ba zRoom->GetName().c_str(), segmentOffset); } -string SetLightingSettings::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) +std::string SetLightingSettings::GenerateSourceCodePass2(std::string roomName, uint32_t baseAddress) { return ""; } -string SetLightingSettings::GetCommandCName() +std::string SetLightingSettings::GetCommandCName() const { return "SCmdLightSettingList"; } -string SetLightingSettings::GenerateExterns() +std::string SetLightingSettings::GenerateExterns() const { return StringHelper::Sprintf("extern LightSettings %sLightSettings_%06X[];\n", zRoom->GetName().c_str(), segmentOffset); } -RoomCommand SetLightingSettings::GetRoomCommand() +RoomCommand SetLightingSettings::GetRoomCommand() const { return RoomCommand::SetLightingSettings; } -LightingSettings::LightingSettings(vector<uint8_t> rawData, uint32_t rawDataIndex) +LightingSettings::LightingSettings(std::vector<uint8_t> rawData, uint32_t rawDataIndex) { const uint8_t* data = rawData.data(); |