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/SetTransitionActorList.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/SetTransitionActorList.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetTransitionActorList.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp b/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp index 103d939..42f53f7 100644 --- a/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp +++ b/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp @@ -9,17 +9,17 @@ using namespace std; SetTransitionActorList::SetTransitionActorList(ZRoom* nZRoom, std::vector<uint8_t> rawData, - int rawDataIndex) + uint32_t rawDataIndex) : ZRoomCommand(nZRoom, rawData, rawDataIndex) { - int numActors = rawData[rawDataIndex + 1]; + int32_t numActors = rawData[rawDataIndex + 1]; segmentOffset = BitConverter::ToInt32BE(rawData, rawDataIndex + 4) & 0x00FFFFFF; transitionActors = vector<TransitionActorEntry*>(); uint32_t currentPtr = segmentOffset; - for (int i = 0; i < numActors; i++) + for (int32_t i = 0; i < numActors; i++) { TransitionActorEntry* entry = new TransitionActorEntry(rawData, currentPtr); transitionActors.push_back(entry); @@ -39,7 +39,7 @@ string SetTransitionActorList::GetSourceOutputCode(std::string prefix) return ""; } -string SetTransitionActorList::GenerateSourceCodePass1(string roomName, int baseAddress) +string SetTransitionActorList::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) { string sourceOutput = StringHelper::Sprintf("%s 0x%02X, (u32)%sTransitionActorList0x%06X", @@ -67,12 +67,12 @@ string SetTransitionActorList::GenerateSourceCodePass1(string roomName, int base return sourceOutput; } -string SetTransitionActorList::GenerateSourceCodePass2(string roomName, int baseAddress) +string SetTransitionActorList::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) { return ""; } -int32_t SetTransitionActorList::GetRawDataSize() +size_t SetTransitionActorList::GetRawDataSize() { return ZRoomCommand::GetRawDataSize() + (transitionActors.size() * 16); } @@ -93,7 +93,7 @@ RoomCommand SetTransitionActorList::GetRoomCommand() return RoomCommand::SetTransitionActorList; } -TransitionActorEntry::TransitionActorEntry(std::vector<uint8_t> rawData, int rawDataIndex) +TransitionActorEntry::TransitionActorEntry(std::vector<uint8_t> rawData, uint32_t rawDataIndex) { frontObjectRoom = rawData[rawDataIndex + 0]; frontTransitionReaction = rawData[rawDataIndex + 1]; |