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/SetExitList.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/SetExitList.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetExitList.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ZAPD/ZRoom/Commands/SetExitList.cpp b/ZAPD/ZRoom/Commands/SetExitList.cpp index 591eea0..89512dd 100644 --- a/ZAPD/ZRoom/Commands/SetExitList.cpp +++ b/ZAPD/ZRoom/Commands/SetExitList.cpp @@ -6,7 +6,7 @@ using namespace std; -SetExitList::SetExitList(ZRoom* nZRoom, std::vector<uint8_t> rawData, int rawDataIndex) +SetExitList::SetExitList(ZRoom* nZRoom, std::vector<uint8_t> rawData, uint32_t rawDataIndex) : ZRoomCommand(nZRoom, rawData, rawDataIndex) { segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); @@ -19,7 +19,7 @@ SetExitList::SetExitList(ZRoom* nZRoom, std::vector<uint8_t> rawData, int rawDat _rawDataIndex = rawDataIndex; } -string SetExitList::GenerateSourceCodePass1(string roomName, int baseAddress) +string SetExitList::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) { string sourceOutput = StringHelper::Sprintf("%s 0x00, (u32)&%sExitList0x%06X", @@ -28,10 +28,10 @@ string SetExitList::GenerateSourceCodePass1(string roomName, int baseAddress) // Parse Entrances and Generate Declaration zRoom->parent->AddDeclarationPlaceholder(segmentOffset); // Make sure this segment is defined - int numEntrances = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 2; + int32_t numEntrances = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 2; uint32_t currentPtr = segmentOffset; - for (int i = 0; i < numEntrances; i++) + for (int32_t i = 0; i < numEntrances; i++) { uint16_t exit = BitConverter::ToInt16BE(_rawData, currentPtr); exits.push_back(exit); |