RomanRom2/whoa
1
0
Fork 0
mirror of https://github.com/whoahq/whoa.git synced 2026-02-01 00:02:45 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(model): correct logic in CM2Model::AttachToParent

Browse Source
This commit is contained in:
fallenoak 2025-11-03 19:17:38 -06:00
parent 3a3b7d5259
commit 642c763612
No known key found for this signature in database
GPG Key ID: 7628F8E61AEA070D
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/model/CM2Model.cpp
View File

@ -693,15 +693,20 @@ void CM2Model::AttachToParent(CM2Model* parent, uint32_t id, const C3Vector* pos
this->SetAnimating(0);
auto& attachmentIndicesById = this->m_shared->m_data->attachmentIndicesById;
// Look up parent attachment index by given ID
uint16_t attachIndex = 0xFFFF;
if (parent->m_loaded && id < attachmentIndicesById.count) {
attachIndex = attachmentIndicesById[id];
}
if (attachIndex == 0xFFFF && !a5) {
return;
if (parent->m_loaded) {
auto& parentAttachmentIndicesById = parent->m_shared->m_data->attachmentIndicesById;
if (id < parentAttachmentIndicesById.Count()) {
attachIndex = parentAttachmentIndicesById[id];
}
if (attachIndex == 0xFFFF && !a5) {
return;
}
}
this->m_attachIndex = attachIndex;