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/SetActorList.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/SetActorList.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetActorList.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ZAPD/ZRoom/Commands/SetActorList.cpp b/ZAPD/ZRoom/Commands/SetActorList.cpp index 5e460f7..8d094e7 100644 --- a/ZAPD/ZRoom/Commands/SetActorList.cpp +++ b/ZAPD/ZRoom/Commands/SetActorList.cpp @@ -8,7 +8,7 @@ using namespace std; -SetActorList::SetActorList(ZRoom* nZRoom, std::vector<uint8_t> rawData, int rawDataIndex) +SetActorList::SetActorList(ZRoom* nZRoom, std::vector<uint8_t> rawData, uint32_t rawDataIndex) : ZRoomCommand(nZRoom, rawData, rawDataIndex) { numActors = rawData[rawDataIndex + 1]; @@ -26,7 +26,6 @@ SetActorList::~SetActorList() for (ActorSpawnEntry* entry : actors) delete entry; - actors.clear(); } string SetActorList::GetSourceOutputCode(std::string prefix) @@ -34,12 +33,12 @@ string SetActorList::GetSourceOutputCode(std::string prefix) return ""; } -string SetActorList::GenerateSourceCodePass1(string roomName, int baseAddress) +string SetActorList::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) { return ""; } -string SetActorList::GenerateSourceCodePass2(string roomName, int baseAddress) +string SetActorList::GenerateSourceCodePass2(string roomName, uint32_t baseAddress) { string sourceOutput = ""; size_t numActorsReal = zRoom->GetDeclarationSizeFromNeighbor(segmentOffset) / 16; @@ -111,9 +110,9 @@ string SetActorList::GenerateSourceCodePass2(string roomName, int baseAddress) return sourceOutput; } -int32_t SetActorList::GetRawDataSize() +size_t SetActorList::GetRawDataSize() { - return ZRoomCommand::GetRawDataSize() + ((int)actors.size() * 16); + return ZRoomCommand::GetRawDataSize() + ((int32_t)actors.size() * 16); } size_t SetActorList::GetActorListArraySize() @@ -155,7 +154,7 @@ RoomCommand SetActorList::GetRoomCommand() return RoomCommand::SetActorList; } -ActorSpawnEntry::ActorSpawnEntry(std::vector<uint8_t> rawData, int rawDataIndex) +ActorSpawnEntry::ActorSpawnEntry(std::vector<uint8_t> rawData, uint32_t rawDataIndex) { const uint8_t* data = rawData.data(); |