From 4a207a10483a5a0bac22499818bde9b43235ab19 Mon Sep 17 00:00:00 2001
From: Christian Semmler <mail@csemmler.com>
Date: Tue, 21 May 2024 14:53:56 -0400
Subject: [PATCH] Name some functions

---
 LEGO1/lego/legoomni/include/legopathstruct.h       |  8 ++++----
 LEGO1/lego/legoomni/src/paths/legopathboundary.cpp |  4 ++--
 LEGO1/lego/legoomni/src/paths/legopathstruct.cpp   | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legopathstruct.h b/LEGO1/lego/legoomni/include/legopathstruct.h
index f99ef2ed..9ea68c25 100644
--- a/LEGO1/lego/legoomni/include/legopathstruct.h
+++ b/LEGO1/lego/legoomni/include/legopathstruct.h
@@ -57,15 +57,15 @@ class LegoPathStruct : public LegoPathStructBase {
 	// FUNCTION: LEGO1 0x10047470
 	~LegoPathStruct() override {}
 
-	virtual void VTable0x04(LegoPathActor* p_actor, MxBool p_bool1, MxU32 p_data); // vtable+0x04
+	virtual void TriggerPathStruct(LegoPathActor* p_actor, MxBool p_bool1, MxU32 p_data); // vtable+0x04
 
 	inline void SetWorld(LegoWorld* p_world) { m_world = p_world; }
 	inline void SetAtomId(const MxAtomId& p_atomId) { m_atomId = p_atomId; }
 
 private:
-	MxBool FUN_1001b740(LegoPathActor* p_actor, MxBool p_bool1, MxU32 p_data, MxBool p_bool2);
-	void FUN_1001bc40(const char* p_name, MxU32 p_objectId, MxBool p_bool);
-	void FUN_1001bd10(MxBool p_direction, MxU32 p_data);
+	MxBool HandleTrigger(LegoPathActor* p_actor, MxBool p_direction, MxU32 p_data, MxBool p_bool2);
+	void FUN_1001bc40(const char* p_name, MxU32 p_data, MxBool p_bool);
+	void PlayMusic(MxBool p_direction, MxU32 p_data);
 
 	LegoWorld* m_world; // 0x0c
 	MxAtomId m_atomId;  // 0x10
diff --git a/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp b/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp
index 1912d256..28a23552 100644
--- a/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp
+++ b/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp
@@ -64,7 +64,7 @@ void LegoPathBoundary::FUN_100575b0(Vector3& p_point1, Vector3& p_point2, LegoPa
 				LegoPathStruct* s = m_unk0x4c[i].m_pathStruct;
 
 				if (m_unk0x4c[i].m_unk0x08 >= dot1 && m_unk0x4c[i].m_unk0x08 < dot2) {
-					s->VTable0x04(p_actor, 1, m_unk0x4c[i].m_data);
+					s->TriggerPathStruct(p_actor, TRUE, m_unk0x4c[i].m_data);
 				}
 			}
 		}
@@ -73,7 +73,7 @@ void LegoPathBoundary::FUN_100575b0(Vector3& p_point1, Vector3& p_point2, LegoPa
 				LegoPathStruct* s = m_unk0x4c[i].m_pathStruct;
 
 				if (m_unk0x4c[i].m_unk0x08 >= dot2 && m_unk0x4c[i].m_unk0x08 < dot1) {
-					s->VTable0x04(p_actor, 0, m_unk0x4c[i].m_data);
+					s->TriggerPathStruct(p_actor, FALSE, m_unk0x4c[i].m_data);
 				}
 			}
 		}
diff --git a/LEGO1/lego/legoomni/src/paths/legopathstruct.cpp b/LEGO1/lego/legoomni/src/paths/legopathstruct.cpp
index f7049788..603e9eb5 100644
--- a/LEGO1/lego/legoomni/src/paths/legopathstruct.cpp
+++ b/LEGO1/lego/legoomni/src/paths/legopathstruct.cpp
@@ -23,19 +23,19 @@ extern MxU32 g_unk0x100f1198;
 MxBool g_unk0x100f119c = FALSE;
 
 // FUNCTION: LEGO1 0x1001b700
-void LegoPathStruct::VTable0x04(LegoPathActor* p_actor, MxBool p_bool1, MxU32 p_data)
+void LegoPathStruct::TriggerPathStruct(LegoPathActor* p_actor, MxBool p_direction, MxU32 p_data)
 {
-	if (!FUN_1001b740(p_actor, p_bool1, p_data, FALSE) && g_unk0x100f119c) {
-		FUN_1001b740(p_actor, p_bool1, p_data, TRUE);
+	if (!HandleTrigger(p_actor, p_direction, p_data, FALSE) && g_unk0x100f119c) {
+		HandleTrigger(p_actor, p_direction, p_data, TRUE);
 	}
 }
 
 // FUNCTION: LEGO1 0x1001b740
 // FUNCTION: BETA10 0x100c26c5
-MxBool LegoPathStruct::FUN_1001b740(LegoPathActor* p_actor, MxBool p_bool1, MxU32 p_data, MxBool p_bool2)
+MxBool LegoPathStruct::HandleTrigger(LegoPathActor* p_actor, MxBool p_direction, MxU32 p_data, MxBool p_bool2)
 {
 	MxBool triggered = FALSE;
-	MxBool bool3 = p_bool2 ? !p_bool1 : p_bool1;
+	MxBool bool3 = p_bool2 ? !p_direction : p_direction;
 
 	MxU32 flags = bool3 ? c_bit5 : c_bit6;
 	flags |= p_actor->GetCameraFlag() ? c_bit1 : (c_bit2 | c_bit3 | c_bit4);
@@ -76,7 +76,7 @@ MxBool LegoPathStruct::FUN_1001b740(LegoPathActor* p_actor, MxBool p_bool1, MxU3
 		}
 		case c_music:
 			if (g_unk0x100f1198 & Isle::c_bit7) {
-				FUN_1001bd10(p_bool1, p_data);
+				PlayMusic(p_direction, p_data);
 			}
 			break;
 		case c_s: {
@@ -126,7 +126,7 @@ void LegoPathStruct::FUN_1001bc40(const char* p_name, MxU32 p_data, MxBool p_boo
 
 // FUNCTION: LEGO1 0x1001bd10
 // FUNCTION: BETA10 0x100c2b4a
-void LegoPathStruct::FUN_1001bd10(MxBool p_direction, MxU32 p_data)
+void LegoPathStruct::PlayMusic(MxBool p_direction, MxU32 p_data)
 {
 	JukeBoxState* state = (JukeBoxState*) GameState()->GetState("JukeBoxState");
 	if (state != NULL && state->m_active) {