From bdc4a93f3051edc36c6628414d933c3ce609fbfb Mon Sep 17 00:00:00 2001
From: jonschz <jonschz@users.noreply.github.com>
Date: Tue, 27 May 2025 17:48:00 +0200
Subject: [PATCH] Match `LegoActor` in BETA10

---
 LEGO1/define.cpp                             | 2 ++
 LEGO1/lego/legoomni/include/legoactor.h      | 7 +++++++
 LEGO1/lego/legoomni/src/actors/act2actor.cpp | 1 -
 LEGO1/lego/legoomni/src/entity/legoactor.cpp | 5 +++++
 LEGO1/library_msvc.h                         | 3 +++
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/LEGO1/define.cpp b/LEGO1/define.cpp
index 1e1ac43a..0a67df0b 100644
--- a/LEGO1/define.cpp
+++ b/LEGO1/define.cpp
@@ -10,6 +10,7 @@ const char* g_strANIMATION = "ANIMATION";
 
 // GLOBAL: LEGO1 0x10102050
 // STRING: LEGO1 0x10102024
+// GLOBAL: BETA10 0x102028b4
 const char* g_strATTACH_CAMERA = "ATTACH_CAMERA";
 
 // GLOBAL: LEGO1 0x10102054
@@ -138,6 +139,7 @@ const char* g_strBMP_ISMAP = "BMP_ISMAP";
 
 // GLOBAL: LEGO1 0x101020e4
 // STRING: LEGO1 0x10101eac
+// GLOBAL: BETA10 0x10202948
 const char* g_parseExtraTokens = ":;";
 
 // GLOBAL: LEGO1 0x100f0c14
diff --git a/LEGO1/lego/legoomni/include/legoactor.h b/LEGO1/lego/legoomni/include/legoactor.h
index 79d8ffeb..a3e68f2e 100644
--- a/LEGO1/lego/legoomni/include/legoactor.h
+++ b/LEGO1/lego/legoomni/include/legoactor.h
@@ -34,6 +34,7 @@ class LegoActor : public LegoEntity {
 	}
 
 	// FUNCTION: LEGO1 0x1002d220
+	// FUNCTION: BETA10 0x10012530
 	MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoActor::ClassName()) || LegoEntity::IsA(p_name);
@@ -43,18 +44,22 @@ class LegoActor : public LegoEntity {
 	void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24
 
 	// FUNCTION: LEGO1 0x10002cc0
+	// FUNCTION: BETA10 0x1000f3e0
 	virtual MxFloat GetSoundFrequencyFactor() { return m_frequencyFactor; } // vtable+0x50
 
 	// FUNCTION: LEGO1 0x10002cd0
+	// FUNCTION: BETA10 0x1000f410
 	virtual void SetSoundFrequencyFactor(MxFloat p_frequencyFactor)
 	{
 		m_frequencyFactor = p_frequencyFactor;
 	} // vtable+0x54
 
 	// FUNCTION: LEGO1 0x10002ce0
+	// FUNCTION: BETA10 0x1000f440
 	virtual void VTable0x58(MxFloat p_unk0x70) { m_unk0x70 = p_unk0x70; } // vtable+0x58
 
 	// FUNCTION: LEGO1 0x10002cf0
+	// FUNCTION: BETA10 0x1000f470
 	virtual MxFloat VTable0x5c() { return m_unk0x70; } // vtable+0x5c
 
 	// FUNCTION: LEGO1 0x10002d00
@@ -62,6 +67,7 @@ class LegoActor : public LegoEntity {
 	virtual MxU8 GetActorId() { return m_actorId; } // vtable+0x60
 
 	// FUNCTION: LEGO1 0x10002d10
+	// FUNCTION: BETA10 0x1000f4d0
 	virtual void SetActorId(MxU8 p_actorId) { m_actorId = p_actorId; } // vtable+0x64
 
 	static const char* GetActorName(MxU8 p_id);
@@ -76,6 +82,7 @@ class LegoActor : public LegoEntity {
 };
 
 // SYNTHETIC: LEGO1 0x1002d300
+// SYNTHETIC: BETA10 0x1003d900
 // LegoActor::`scalar deleting destructor'
 
 #endif // LEGOACTOR_H
diff --git a/LEGO1/lego/legoomni/src/actors/act2actor.cpp b/LEGO1/lego/legoomni/src/actors/act2actor.cpp
index df163a18..d6af311e 100644
--- a/LEGO1/lego/legoomni/src/actors/act2actor.cpp
+++ b/LEGO1/lego/legoomni/src/actors/act2actor.cpp
@@ -133,7 +133,6 @@ Act2Actor::Act2Actor()
 }
 
 // FUNCTION: LEGO1 0x10018940
-// FUNCTION: BETA10 0x1003d65f
 void Act2Actor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2)
 {
 	LegoAnimActor::SetROI(p_roi, p_bool1, p_bool2);
diff --git a/LEGO1/lego/legoomni/src/entity/legoactor.cpp b/LEGO1/lego/legoomni/src/entity/legoactor.cpp
index 16787149..c1ce3f74 100644
--- a/LEGO1/lego/legoomni/src/entity/legoactor.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legoactor.cpp
@@ -23,6 +23,7 @@ LegoActor::LegoActor()
 }
 
 // FUNCTION: LEGO1 0x1002d320
+// FUNCTION: BETA10 0x1003d08b
 LegoActor::~LegoActor()
 {
 	if (m_sound) {
@@ -31,6 +32,7 @@ LegoActor::~LegoActor()
 }
 
 // FUNCTION: LEGO1 0x1002d390
+// FUNCTION: BETA10 0x1003d10b
 void LegoActor::ParseAction(char* p_extra)
 {
 	MxFloat speed = 0.0F;
@@ -90,6 +92,8 @@ void LegoActor::ParseAction(char* p_extra)
 				up[2] = atof(token);
 			}
 
+			assert(token);
+
 			SetWorldTransform(location, direction, up);
 		}
 		else {
@@ -122,6 +126,7 @@ const char* LegoActor::GetActorName(MxU8 p_id)
 }
 
 // FUNCTION: LEGO1 0x1002d670
+// FUNCTION: BETA10 0x1003d65f
 void LegoActor::SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2)
 {
 	if (p_roi) {
diff --git a/LEGO1/library_msvc.h b/LEGO1/library_msvc.h
index b0542e13..96437e7a 100644
--- a/LEGO1/library_msvc.h
+++ b/LEGO1/library_msvc.h
@@ -840,6 +840,9 @@
 // LIBRARY: BETA10 0x100f8ad0
 // strcmp
 
+// LIBRARY: BETA10 0x100f9f60
+// strtok
+
 // LIBRARY: BETA10 0x100f9610
 // rand