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/ZResource.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/ZResource.cpp')
| -rw-r--r-- | ZAPD/ZResource.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/ZAPD/ZResource.cpp b/ZAPD/ZResource.cpp index 767fc0f..9e16f27 100644 --- a/ZAPD/ZResource.cpp +++ b/ZAPD/ZResource.cpp @@ -18,7 +18,7 @@ ZResource::ZResource(ZFile* nParent) } void ZResource::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector<uint8_t>& nRawData, - const int nRawDataIndex, const std::string& nRelPath) + const uint32_t nRawDataIndex, const std::string& nRelPath) { rawData = nRawData; rawDataIndex = nRawDataIndex; @@ -30,7 +30,7 @@ void ZResource::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector<u ParseRawData(); } -void ZResource::ExtractFromFile(const std::vector<uint8_t>& nRawData, int nRawDataIndex, +void ZResource::ExtractFromFile(const std::vector<uint8_t>& nRawData, uint32_t nRawDataIndex, const std::string& nRelPath) { rawData = nRawData; @@ -139,17 +139,17 @@ void ZResource::SetRawData(std::vector<uint8_t> nData) rawData = nData; } -int ZResource::GetRawDataIndex() +uint32_t ZResource::GetRawDataIndex() { return rawDataIndex; } -int ZResource::GetRawDataSize() +size_t ZResource::GetRawDataSize() { return rawData.size(); } -void ZResource::SetRawDataIndex(int value) +void ZResource::SetRawDataIndex(uint32_t value) { rawDataIndex = value; } @@ -196,3 +196,7 @@ uint32_t Seg2Filespace(segptr_t segmentedAddress, uint32_t parentBaseAddress) return currentPtr; } + +ZResource::~ZResource() +{ +}
\ No newline at end of file |