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

Improve match

Browse Source
This commit is contained in:
Christian Semmler 2024-02-02 10:59:30 -05:00
parent 777f1b64ac
commit 7996aab043
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/lego/legoomni/include/legoentitylist.h
View File

@ -74,7 +74,7 @@ class LegoEntityListCursor : public MxPtrListCursor<LegoEntity> {
// SYNTHETIC: LEGO1 0x1001f110 // SYNTHETIC: LEGO1 0x1001f110
// LegoEntityListCursor::`scalar deleting destructor' // LegoEntityListCursor::`scalar deleting destructor'
// FUNCTION: LEGO1 0x1001f180 // TEMPLATE: LEGO1 0x1001f180
// MxPtrListCursor<LegoEntity>::~MxPtrListCursor<LegoEntity> // MxPtrListCursor<LegoEntity>::~MxPtrListCursor<LegoEntity>
// SYNTHETIC: LEGO1 0x1001f1d0 // SYNTHETIC: LEGO1 0x1001f1d0
@ -83,7 +83,7 @@ class LegoEntityListCursor : public MxPtrListCursor<LegoEntity> {
// SYNTHETIC: LEGO1 0x1001f240 // SYNTHETIC: LEGO1 0x1001f240
// MxPtrListCursor<LegoEntity>::`scalar deleting destructor' // MxPtrListCursor<LegoEntity>::`scalar deleting destructor'
// FUNCTION: LEGO1 0x1001f2b0 // TEMPLATE: LEGO1 0x1001f2b0
// MxListCursor<LegoEntity *>::~MxListCursor<LegoEntity *> // MxListCursor<LegoEntity *>::~MxListCursor<LegoEntity *>
// FUNCTION: LEGO1 0x1001f300 // FUNCTION: LEGO1 0x1001f300

5
LEGO1/lego/legoomni/include/legopathcontrollerlist.h
View File

@ -79,7 +79,7 @@ class LegoPathControllerListCursor : public MxPtrListCursor<LegoPathController>
// SYNTHETIC: LEGO1 0x1001f830 // SYNTHETIC: LEGO1 0x1001f830
// LegoPathControllerListCursor::`scalar deleting destructor' // LegoPathControllerListCursor::`scalar deleting destructor'
// FUNCTION: LEGO1 0x1001f8a0 // TEMPLATE: LEGO1 0x1001f8a0
// MxPtrListCursor<LegoPathController>::~MxPtrListCursor<LegoPathController> // MxPtrListCursor<LegoPathController>::~MxPtrListCursor<LegoPathController>
// SYNTHETIC: LEGO1 0x1001f8f0 // SYNTHETIC: LEGO1 0x1001f8f0
@ -88,9 +88,10 @@ class LegoPathControllerListCursor : public MxPtrListCursor<LegoPathController>
// SYNTHETIC: LEGO1 0x1001f960 // SYNTHETIC: LEGO1 0x1001f960
// MxPtrListCursor<LegoPathController>::`scalar deleting destructor' // MxPtrListCursor<LegoPathController>::`scalar deleting destructor'
// FUNCTION: LEGO1 0x1001f9d0 // TEMPLATE: LEGO1 0x1001f9d0
// MxListCursor<LegoPathController *>::~MxListCursor<LegoPathController *> // MxListCursor<LegoPathController *>::~MxListCursor<LegoPathController *>
// FUNCTION: LEGO1 0x1001fa20
// LegoPathControllerListCursor::~LegoPathControllerListCursor // LegoPathControllerListCursor::~LegoPathControllerListCursor
#endif // LEGOPATHCONTROLLERLIST_H #endif // LEGOPATHCONTROLLERLIST_H

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

@ -568,15 +568,9 @@ void LegoWorld::VTable0x68(MxBool p_und)
GameState()->FUN_10039940(); GameState()->FUN_10039940();
SetIsWorldActive(TRUE); SetIsWorldActive(TRUE);
return;
} }
if (p_und)
return;
} }
else if (m_set0xd0.empty()) {
if (m_set0xd0.empty()) {
IslePathActor* vehicle = CurrentVehicle(); IslePathActor* vehicle = CurrentVehicle();
if (vehicle) { if (vehicle) {
@ -602,11 +596,8 @@ void LegoWorld::VTable0x68(MxBool p_und)
} }
for (MxCoreSet::iterator it = m_set0xa8.begin(); it != m_set0xa8.end(); it++) { for (MxCoreSet::iterator it = m_set0xa8.begin(); it != m_set0xa8.end(); it++) {
if ((*it)->IsA("LegoActionControlPresenter")) { if ((*it)->IsA("LegoActionControlPresenter") ||
m_set0xd0.insert(*it); ((*it)->IsA("MxPresenter") && ((MxPresenter*) *it)->IsEnabled())) {
((MxPresenter*) *it)->Enable(FALSE);
}
else if ((*it)->IsA("MxPresenter") && ((MxPresenter*) *it)->IsEnabled()) {
m_set0xd0.insert(*it); m_set0xd0.insert(*it);
((MxPresenter*) *it)->Enable(FALSE); ((MxPresenter*) *it)->Enable(FALSE);
} }