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

Match

Browse Source
This commit is contained in:
Christian Semmler 2024-01-27 11:33:46 -05:00
parent 862e54cb04
commit 996a3adcb8
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
LEGO1/lego/legoomni/include/legolocomotionanimpresenter.h
View File

@ -35,12 +35,9 @@ class LegoLocomotionAnimPresenter : public LegoLoopingAnimPresenter {
// SYNTHETIC: LEGO1 0x1006cfe0 // SYNTHETIC: LEGO1 0x1006cfe0
// LegoLocomotionAnimPresenter::`scalar deleting destructor' // LegoLocomotionAnimPresenter::`scalar deleting destructor'
inline undefined2 DecrementUnknown0xd4() inline void DecrementUnknown0xd4() { --m_unk0xd4; }
{
if (m_unk0xd4 != 0) inline undefined2 GetUnknown0xd4() { return m_unk0xd4; }
--m_unk0xd4;
return m_unk0xd4;
}
private: private:
void Init(); void Init();

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

@ -117,7 +117,12 @@ void LegoWorld::Destroy(MxBool p_fromDestructor)
MxDSAction* action = presenter->GetAction(); MxDSAction* action = presenter->GetAction();
if (action) { if (action) {
if (presenter->IsA("LegoLocomotionAnimPresenter")) { if (presenter->IsA("LegoLocomotionAnimPresenter")) {
if (((LegoLocomotionAnimPresenter*) presenter)->DecrementUnknown0xd4() == 0) { LegoLocomotionAnimPresenter* animPresenter = (LegoLocomotionAnimPresenter*) presenter;
if (animPresenter->GetUnknown0xd4() != 0)
animPresenter->DecrementUnknown0xd4();
if (animPresenter->GetUnknown0xd4() == 0) {
FUN_100b7220(action, MxDSAction::c_world, FALSE); FUN_100b7220(action, MxDSAction::c_world, FALSE);
presenter->EndAction(); presenter->EndAction();
} }
@ -193,10 +198,6 @@ void LegoWorld::Destroy(MxBool p_fromDestructor)
} }
while (!m_list0xe0.empty()) { while (!m_list0xe0.empty()) {
/*list<AutoROI*>::iterator it = m_list0xe0.begin();
AutoROI* roi = *it;
m_list0xe0.erase(it);*/
AutoROI* roi = m_list0xe0.front(); AutoROI* roi = m_list0xe0.front();
m_list0xe0.pop_front(); m_list0xe0.pop_front();
delete roi; delete roi;