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/SetObjectList.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/SetObjectList.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetObjectList.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ZAPD/ZRoom/Commands/SetObjectList.cpp b/ZAPD/ZRoom/Commands/SetObjectList.cpp index 6d0164a..52e2052 100644 --- a/ZAPD/ZRoom/Commands/SetObjectList.cpp +++ b/ZAPD/ZRoom/Commands/SetObjectList.cpp @@ -8,7 +8,7 @@ using namespace std; -SetObjectList::SetObjectList(ZRoom* nZRoom, std::vector<uint8_t> rawData, int rawDataIndex) +SetObjectList::SetObjectList(ZRoom* nZRoom, std::vector<uint8_t> rawData, uint32_t rawDataIndex) : ZRoomCommand(nZRoom, rawData, rawDataIndex) { objects = vector<uint16_t>(); @@ -33,7 +33,7 @@ string SetObjectList::GenerateExterns() segmentOffset); } -string SetObjectList::GenerateSourceCodePass1(string roomName, int baseAddress) +string SetObjectList::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) { string sourceOutput = ""; @@ -61,7 +61,7 @@ string SetObjectList::GenerateSourceCodePass1(string roomName, int baseAddress) return sourceOutput; } -int32_t SetObjectList::GetRawDataSize() +size_t SetObjectList::GetRawDataSize() { return ZRoomCommand::GetRawDataSize() + (objects.size() * 2); } |