From 7996aab043a3051968cdddc9311a84c6020e0046 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Fri, 2 Feb 2024 10:59:30 -0500
Subject: [PATCH] Improve match

---
 LEGO1/lego/legoomni/include/legoentitylist.h      |  4 ++--
 .../legoomni/include/legopathcontrollerlist.h     |  5 +++--
 LEGO1/lego/legoomni/src/entity/legoworld.cpp      | 15 +++------------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legoentitylist.h b/LEGO1/lego/legoomni/include/legoentitylist.h
index ef64b06c..938c85d4 100644
--- a/LEGO1/lego/legoomni/include/legoentitylist.h
+++ b/LEGO1/lego/legoomni/include/legoentitylist.h
@@ -74,7 +74,7 @@ class LegoEntityListCursor : public MxPtrListCursor<LegoEntity> {
 // SYNTHETIC: LEGO1 0x1001f110
 // LegoEntityListCursor::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x1001f180
+// TEMPLATE: LEGO1 0x1001f180
 // MxPtrListCursor<LegoEntity>::~MxPtrListCursor<LegoEntity>
 
 // SYNTHETIC: LEGO1 0x1001f1d0
@@ -83,7 +83,7 @@ class LegoEntityListCursor : public MxPtrListCursor<LegoEntity> {
 // SYNTHETIC: LEGO1 0x1001f240
 // MxPtrListCursor<LegoEntity>::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x1001f2b0
+// TEMPLATE: LEGO1 0x1001f2b0
 // MxListCursor<LegoEntity *>::~MxListCursor<LegoEntity *>
 
 // FUNCTION: LEGO1 0x1001f300
diff --git a/LEGO1/lego/legoomni/include/legopathcontrollerlist.h b/LEGO1/lego/legoomni/include/legopathcontrollerlist.h
index f093f4d5..af2642a2 100644
--- a/LEGO1/lego/legoomni/include/legopathcontrollerlist.h
+++ b/LEGO1/lego/legoomni/include/legopathcontrollerlist.h
@@ -79,7 +79,7 @@ class LegoPathControllerListCursor : public MxPtrListCursor<LegoPathController>
 // SYNTHETIC: LEGO1 0x1001f830
 // LegoPathControllerListCursor::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x1001f8a0
+// TEMPLATE: LEGO1 0x1001f8a0
 // MxPtrListCursor<LegoPathController>::~MxPtrListCursor<LegoPathController>
 
 // SYNTHETIC: LEGO1 0x1001f8f0
@@ -88,9 +88,10 @@ class LegoPathControllerListCursor : public MxPtrListCursor<LegoPathController>
 // SYNTHETIC: LEGO1 0x1001f960
 // MxPtrListCursor<LegoPathController>::`scalar deleting destructor'
 
-// FUNCTION: LEGO1 0x1001f9d0
+// TEMPLATE: LEGO1 0x1001f9d0
 // MxListCursor<LegoPathController *>::~MxListCursor<LegoPathController *>
 
+// FUNCTION: LEGO1 0x1001fa20
 // LegoPathControllerListCursor::~LegoPathControllerListCursor
 
 #endif // LEGOPATHCONTROLLERLIST_H
diff --git a/LEGO1/lego/legoomni/src/entity/legoworld.cpp b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
index 4a848f63..a88d957b 100644
--- a/LEGO1/lego/legoomni/src/entity/legoworld.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoworld.cpp
@@ -568,15 +568,9 @@ void LegoWorld::VTable0x68(MxBool p_und)
 
 			GameState()->FUN_10039940();
 			SetIsWorldActive(TRUE);
-
-			return;
 		}
-
-		if (p_und)
-			return;
 	}
-
-	if (m_set0xd0.empty()) {
+	else if (m_set0xd0.empty()) {
 		IslePathActor* vehicle = CurrentVehicle();
 
 		if (vehicle) {
@@ -602,11 +596,8 @@ void LegoWorld::VTable0x68(MxBool p_und)
 		}
 
 		for (MxCoreSet::iterator it = m_set0xa8.begin(); it != m_set0xa8.end(); it++) {
-			if ((*it)->IsA("LegoActionControlPresenter")) {
-				m_set0xd0.insert(*it);
-				((MxPresenter*) *it)->Enable(FALSE);
-			}
-			else if ((*it)->IsA("MxPresenter") && ((MxPresenter*) *it)->IsEnabled()) {
+			if ((*it)->IsA("LegoActionControlPresenter") ||
+				((*it)->IsA("MxPresenter") && ((MxPresenter*) *it)->IsEnabled())) {
 				m_set0xd0.insert(*it);
 				((MxPresenter*) *it)->Enable(FALSE);
 			}