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/SetCutscenes.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/SetCutscenes.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetCutscenes.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ZAPD/ZRoom/Commands/SetCutscenes.cpp b/ZAPD/ZRoom/Commands/SetCutscenes.cpp index 0ed124f..b342e86 100644 --- a/ZAPD/ZRoom/Commands/SetCutscenes.cpp +++ b/ZAPD/ZRoom/Commands/SetCutscenes.cpp @@ -7,13 +7,12 @@ using namespace std; -SetCutscenes::SetCutscenes(ZRoom* nZRoom, std::vector<uint8_t> rawData, int rawDataIndex) +SetCutscenes::SetCutscenes(ZRoom* nZRoom, std::vector<uint8_t> rawData, uint32_t rawDataIndex) : ZRoomCommand(nZRoom, rawData, rawDataIndex) { numCutscenes = rawData[rawDataIndex + 1]; segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4)); - uint32_t curPtr = segmentOffset; string output = ""; if (Globals::Instance->game == ZGame::OOT_RETAIL || Globals::Instance->game == ZGame::OOT_SW97) @@ -34,7 +33,7 @@ SetCutscenes::SetCutscenes(ZRoom* nZRoom, std::vector<uint8_t> rawData, int rawD int32_t currentPtr = segmentOffset; string declaration = ""; - for (int i = 0; i < numCutscenes; i++) + for (uint8_t i = 0; i < numCutscenes; i++) { CutsceneEntry* entry = new CutsceneEntry(rawData, currentPtr); cutsceneEntries.push_back(entry); @@ -88,7 +87,7 @@ SetCutscenes::~SetCutscenes() delete entry; } -string SetCutscenes::GenerateSourceCodePass1(string roomName, int baseAddress) +string SetCutscenes::GenerateSourceCodePass1(string roomName, uint32_t baseAddress) { string pass1 = ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress); Declaration* decl = zRoom->parent->GetDeclaration(segmentOffset); @@ -101,7 +100,7 @@ string SetCutscenes::GenerateSourceCodePass1(string roomName, int baseAddress) zRoom->GetName().c_str(), segmentOffset); } -int32_t SetCutscenes::GetRawDataSize() +size_t SetCutscenes::GetRawDataSize() { return ZRoomCommand::GetRawDataSize() + (0); } @@ -138,7 +137,7 @@ string SetCutscenes::GetSourceOutputCode(std::string prefix) return ""; } -CutsceneEntry::CutsceneEntry(std::vector<uint8_t> rawData, int rawDataIndex) +CutsceneEntry::CutsceneEntry(std::vector<uint8_t> rawData, uint32_t rawDataIndex) : segmentOffset(BitConverter::ToInt32BE(rawData, rawDataIndex + 0) & 0x00FFFFFF), exit(BitConverter::ToInt16BE(rawData, rawDataIndex + 4)), entrance(rawData[rawDataIndex + 6]), flag(rawData[rawDataIndex + 7]) |