isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-28 18:51:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Improve match

Browse Source
This commit is contained in:
Christian Semmler 2024-01-26 09:58:13 -05:00
parent 33192c6683
commit 72eb49b70d
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
LEGO1/lego/legoomni/src/entity/legoworld.cpp
View File

@ -183,24 +183,29 @@ MxCore* LegoWorld::FUN_10021790(MxAtomId& p_atom, MxS32 p_entityId)
MxPresenter* presenter; MxPresenter* presenter;
while (presenterCursor0xb8.Next(presenter)) { while (presenterCursor0xb8.Next(presenter)) {
if (presenter->GetAction()->GetAtomId() == p_atom && presenter->GetAction()->GetObjectId() == p_entityId) MxDSAction* action = presenter->GetAction();
if (action->GetAtomId() == p_atom && action->GetObjectId() == p_entityId)
return presenter; return presenter;
} }
MxPresenterListCursor presenterCursor0x80(&m_list0x80); MxPresenterListCursor presenterCursor0x80(&m_list0x80);
while (presenterCursor0x80.Next(presenter)) { while (presenterCursor0x80.Next(presenter)) {
if (presenter->GetAction() && presenter->GetAction()->GetAtomId() == p_atom && MxDSAction* action = presenter->GetAction();
presenter->GetAction()->GetObjectId() == p_entityId)
if (action && action->GetAtomId() == p_atom && action->GetObjectId() == p_entityId)
return presenter; return presenter;
} }
for (MxPresenterSet::iterator it = m_set0xa8.begin(); it != m_set0xa8.end(); it++) { for (MxPresenterSet::iterator it = m_set0xa8.begin(); it != m_set0xa8.end(); it++) {
MxCore* core = *it; MxCore* core = *it;
if (core->IsA("MxPresenter")) { if (core->IsA("MxPresenter")) {
presenter = (MxPresenter*) *it; MxPresenter* presenter = (MxPresenter*) *it;
if (presenter->GetAction()->GetAtomId() == p_atom && presenter->GetAction()->GetObjectId() == p_entityId) if (presenter->GetAction()->GetAtomId() == p_atom && presenter->GetAction()->GetObjectId() == p_entityId)
return presenter; return *it;
} }
} }