diff options
| author | Léo Lam <leo@leolam.fr> | 2021-04-08 02:18:15 +0200 |
|---|---|---|
| committer | Léo Lam <leo@leolam.fr> | 2021-04-08 02:18:37 +0200 |
| commit | 2364c80231b471d2db32c3ed02a16377378b682c (patch) | |
| tree | 8d940f56679a799d011f9f06df0149e657aa5b5e /src/KingSystem/Resource/resResourceModelList.cpp | |
| parent | 5adfee548a8aa5aca4e5a34fdddf855e5085e2eb (diff) | |
Update sead and fix sead::Buffer::tryAllocBuffer issues
Diffstat (limited to 'src/KingSystem/Resource/resResourceModelList.cpp')
| -rw-r--r-- | src/KingSystem/Resource/resResourceModelList.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/KingSystem/Resource/resResourceModelList.cpp b/src/KingSystem/Resource/resResourceModelList.cpp index 9450ee52..feee9a38 100644 --- a/src/KingSystem/Resource/resResourceModelList.cpp +++ b/src/KingSystem/Resource/resResourceModelList.cpp @@ -104,13 +104,8 @@ bool ModelList::parse_(u8* data, size_t size, sead::Heap* heap) { return true; } -bool allocModelDataBuffer(sead::Buffer<ModelList::ModelData>& buffer, int size, sead::Heap* heap, - int alignment = sizeof(void*)) { - return buffer.tryAllocBuffer(size, heap, alignment); -} - bool ModelList::parseModelData(const agl::utl::ResParameterList& res, sead::Heap* heap) { - if (!allocModelDataBuffer(mModelData, res.getResParameterListNum() != 0, heap)) + if (!mModelData.tryAllocBuffer(res.getResParameterListNum() != 0, heap)) return false; sead::FixedSafeString<32> list_name{str_ModelData}; @@ -154,11 +149,6 @@ bool ModelList::parseModelData(const agl::utl::ResParameterList& res, sead::Heap return true; } -bool allocAnmTargetPartialBuffer(sead::Buffer<ModelList::Partial>& buffer, int size, - sead::Heap* heap, int alignment = sizeof(void*)) { - return buffer.tryAllocBuffer(size, heap, alignment); -} - bool ModelList::parseAnmTarget(const agl::utl::ResParameterList& res, sead::Heap* heap) { if (!mAnmTargets.tryAllocBuffer(std::min<u32>(res.getResParameterListNum(), NumUnitMax), heap)) return false; @@ -180,7 +170,7 @@ bool ModelList::parseAnmTarget(const agl::utl::ResParameterList& res, sead::Heap const auto partials = agl::utl::getResParameterList(res.getResParameterList(it.getIndex()), str_Partial); if (partials.ptr() && partials.getResParameterObjNum() != 0) { - if (!allocAnmTargetPartialBuffer(it->partials, partials.getResParameterObjNum(), heap)) + if (!it->partials.tryAllocBuffer(partials.getResParameterObjNum(), heap)) return false; sead::FixedSafeString<32> partial_name{str_Partial}; |
