diff options
| author | louist103 <35883445+louist103@users.noreply.github.com> | 2021-04-24 16:42:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-24 16:42:52 -0400 |
| commit | 6d27dbaab3b32ccebb076895fac3cc6aa3240d6c (patch) | |
| tree | 601c6ab5bef2f93b6d6ef4ba5506eb04dfb59c9f /ZAPD/ZRoom/Commands/SetMinimapChests.cpp | |
| parent | ee8bdea252db4c764f4a2567c32754118fdce10b (diff) | |
Fix most -Wall warnings (#115)
* started on basic type errors
* Done. For now
* remove libgfxd binary
* Most warnings fixed
* Fix conflicts and new warnings
* Makefile
* Sig
* Clang format
* destructor
* Add a bunch of destructors
* clear the scalars vector after freeing the elements
* PR fixes (Anghelo Alf)
* Fix most clang -Wall warnings
Diffstat (limited to 'ZAPD/ZRoom/Commands/SetMinimapChests.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetMinimapChests.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ZAPD/ZRoom/Commands/SetMinimapChests.cpp b/ZAPD/ZRoom/Commands/SetMinimapChests.cpp index 4fd28db..64b1d31 100644 --- a/ZAPD/ZRoom/Commands/SetMinimapChests.cpp +++ b/ZAPD/ZRoom/Commands/SetMinimapChests.cpp @@ -7,15 +7,15 @@ using namespace std; -SetMinimapChests::SetMinimapChests(ZRoom* nZRoom, std::vector<uint8_t> rawData, int rawDataIndex) +SetMinimapChests::SetMinimapChests(ZRoom* nZRoom, std::vector<uint8_t> rawData, uint32_t rawDataIndex) : ZRoomCommand(nZRoom, rawData, rawDataIndex) { - int numChests = rawData[rawDataIndex + 1]; + int32_t numChests = rawData[rawDataIndex + 1]; segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); int32_t currentPtr = segmentOffset; - for (int i = 0; i < numChests; i++) + for (int32_t i = 0; i < numChests; i++) { MinimapChest* chest = new MinimapChest(rawData, currentPtr); chests.push_back(chest); @@ -30,12 +30,12 @@ SetMinimapChests::~SetMinimapChests() delete chest; } -string SetMinimapChests::GenerateSourceCodePass1(string roomName, int baseAddress) +string SetMinimapChests::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) { return std::string(); } -string SetMinimapChests::GenerateSourceCodePass2(string roomName, int baseAddress) +string SetMinimapChests::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) { string sourceOutput = ""; @@ -86,12 +86,12 @@ RoomCommand SetMinimapChests::GetRoomCommand() return RoomCommand::SetMinimapChests; } -int32_t SetMinimapChests::GetRawDataSize() +size_t SetMinimapChests::GetRawDataSize() { return ZRoomCommand::GetRawDataSize() + (chests.size() * 10); } -MinimapChest::MinimapChest(std::vector<uint8_t> rawData, int rawDataIndex) +MinimapChest::MinimapChest(std::vector<uint8_t> rawData, uint32_t rawDataIndex) : unk0(BitConverter::ToUInt16BE(rawData, rawDataIndex + 0)), unk2(BitConverter::ToUInt16BE(rawData, rawDataIndex + 2)), unk4(BitConverter::ToUInt16BE(rawData, rawDataIndex + 4)), |