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/ZSkeleton.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/ZSkeleton.cpp')
| -rw-r--r-- | ZAPD/ZSkeleton.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ZAPD/ZSkeleton.cpp b/ZAPD/ZSkeleton.cpp index cc33425..1d7bf5a 100644 --- a/ZAPD/ZSkeleton.cpp +++ b/ZAPD/ZSkeleton.cpp @@ -12,12 +12,12 @@ ZSkeleton::ZSkeleton(ZFile* nParent) : ZResource(nParent) type = ZSkeletonType::Normal; limbType = ZLimbType::Standard; limbs = vector<ZLimb*>(); - rootLimb = nullptr; + //rootLimb = nullptr; dListCount = 0; } ZSkeleton::ZSkeleton(ZSkeletonType nType, ZLimbType nLimbType, const std::string& prefix, - const std::vector<uint8_t>& nRawData, int nRawDataIndex, ZFile* nParent) + const std::vector<uint8_t>& nRawData, uint32_t nRawDataIndex, ZFile* nParent) : ZResource(nParent) { rawData.assign(nRawData.begin(), nRawData.end()); @@ -126,7 +126,7 @@ void ZSkeleton::ParseRawData() } void ZSkeleton::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) { ZResource::ExtractFromXML(reader, nRawData, nRawDataIndex, nRelPath); @@ -163,7 +163,7 @@ void ZSkeleton::GenerateHLIntermediette(HLFileIntermediette& hlFile) mdl->blocks.push_back(new HLTerminator()); } -int ZSkeleton::GetRawDataSize() +size_t ZSkeleton::GetRawDataSize() { switch (type) { |