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/SetCsCamera.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/SetCsCamera.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetCsCamera.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/ZAPD/ZRoom/Commands/SetCsCamera.cpp b/ZAPD/ZRoom/Commands/SetCsCamera.cpp index b7bed8a..30d2f5c 100644 --- a/ZAPD/ZRoom/Commands/SetCsCamera.cpp +++ b/ZAPD/ZRoom/Commands/SetCsCamera.cpp @@ -4,8 +4,6 @@ #include "../../ZFile.h" #include "../ZRoom.h" -using namespace std; - SetCsCamera::SetCsCamera(ZRoom* nZRoom, std::vector<uint8_t> rawData, uint32_t rawDataIndex) : ZRoomCommand(nZRoom, rawData, rawDataIndex) { @@ -55,19 +53,19 @@ SetCsCamera::~SetCsCamera() delete entry; } -string SetCsCamera::GetSourceOutputCode(std::string prefix) +std::string SetCsCamera::GetSourceOutputCode(std::string prefix) { return ""; } -string SetCsCamera::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) +std::string SetCsCamera::GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress) { return ""; } -string SetCsCamera::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) +std::string SetCsCamera::GenerateSourceCodePass2(std::string roomName, uint32_t baseAddress) { - string sourceOutput = ""; + std::string sourceOutput = ""; sourceOutput += StringHelper::Sprintf("%s %i, (u32)&%sCsCameraList0x%06X };", @@ -76,7 +74,7 @@ string SetCsCamera::GenerateSourceCodePass2(string roomName, uint32_t baseAddres if (points.size() > 0) { - string declaration = ""; + std::string declaration = ""; size_t index = 0; for (Vec3s point : points) { @@ -98,7 +96,7 @@ string SetCsCamera::GenerateSourceCodePass2(string roomName, uint32_t baseAddres } { - string declaration = ""; + std::string declaration = ""; size_t index = 0; size_t pointsIndex = 0; @@ -125,22 +123,22 @@ string SetCsCamera::GenerateSourceCodePass2(string roomName, uint32_t baseAddres return sourceOutput; } -size_t SetCsCamera::GetRawDataSize() +size_t SetCsCamera::GetRawDataSize() const { return ZRoomCommand::GetRawDataSize() + (cameras.size() * 8) + (points.size() * 6); } -string SetCsCamera::GenerateExterns() +std::string SetCsCamera::GenerateExterns() const { return ""; } -string SetCsCamera::GetCommandCName() +std::string SetCsCamera::GetCommandCName() const { return "SCmdCsCameraList"; } -RoomCommand SetCsCamera::GetRoomCommand() +RoomCommand SetCsCamera::GetRoomCommand() const { return RoomCommand::SetCsCamera; } |