Order symbols until end of LegoOmni (#1371)

* Order * Improve * Move function * Order until end of LegoOmni * Remove header
2025-10-23 08:24:16 +00:00 · 2025-01-22 14:22:58 -07:00
parent 4db8b44ce0
commit 49cb120795
9 changed files with 346 additions and 364 deletions
--- a/LEGO1/lego/legoomni/src/race/legoracespecial.cpp
+++ b/LEGO1/lego/legoomni/src/race/legoracespecial.cpp
@@ -13,6 +13,7 @@
 // File name verified by BETA10 0x100cedf7

 DECOMP_SIZE_ASSERT(LegoCarRaceActor, 0x1a0)
+DECOMP_SIZE_ASSERT(LegoJetskiRaceActor, 0x1a8)

 // GLOBAL: LEGO1 0x100f0c68
 // STRING: LEGO1 0x100f0c5c
@@ -33,6 +34,10 @@ const char* g_racing = "RACING";
 // GLOBAL: LEGO1 0x100f7aec
 MxFloat LegoCarRaceActor::g_unk0x100f7aec = 8.0f;

+// GLOBAL: LEGO1 0x100da044
+// GLOBAL: BETA10 0x101be9fc
+MxFloat g_unk0x100da044 = 8.0f;
+
 // FUNCTION: LEGO1 0x10080350
 // FUNCTION: BETA10 0x100cd6b0
 LegoCarRaceActor::LegoCarRaceActor()
@@ -284,9 +289,133 @@ MxResult LegoCarRaceActor::VTable0x9c()
 	return SUCCESS;
 }

+// FUNCTION: LEGO1 0x10080ef0
+// FUNCTION: BETA10 0x100a8990
+LegoJetskiRaceActor::LegoJetskiRaceActor()
+{
+	m_unk0x10 = 0.95f;
+	m_unk0x14 = 0.04f;
+	m_unk0x18 = 0.5f;
+	m_unk0x150 = 1.5f;
+}
+
+// FUNCTION: LEGO1 0x10081120
+// FUNCTION: BETA10 0x100ce19f
+MxS32 LegoJetskiRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_edge)
+{
+	// These are almost certainly not the correct names, but they produce the correct BETA10 stack
+	Mx3DPointFloat a;
+	Mx3DPointFloat bbb;
+	Mx3DPointFloat c;
+
+	// These names are verified by an assertion below
+	Vector3* v1 = NULL;
+	Vector3* v2 = NULL;
+
+	if (m_actorState == c_one) {
+		if (m_destEdge == LegoPathController::GetControlEdgeA(13)) {
+			m_boundary = (LegoPathBoundary*) m_destEdge->OtherFace(LegoPathController::GetControlBoundaryA(13));
+		}
+		else if (m_destEdge == LegoPathController::GetControlEdgeA(15)) {
+			m_boundary = (LegoPathBoundary*) m_destEdge->OtherFace(LegoPathController::GetControlBoundaryA(15));
+		}
+
+		m_actorState = c_initial;
+		m_unk0x7c = 0;
+
+		if (m_userNavFlag) {
+			NavController()->SetLinearVel(m_worldSpeed);
+			return 0;
+		}
+		else {
+			return 1;
+		}
+	}
+	else {
+		if (p_edge == LegoPathController::GetControlEdgeA(12)) {
+			m_actorState = c_one;
+
+			if (m_worldSpeed < g_unk0x100da044) {
+				m_worldSpeed = g_unk0x100da044;
+			}
+
+			m_destEdge = LegoPathController::GetControlEdgeA(13);
+			m_boundary = LegoPathController::GetControlBoundaryA(13);
+		}
+		else if (p_edge == LegoPathController::GetControlEdgeA(14)) {
+			m_actorState = c_one;
+
+			if (m_worldSpeed < g_unk0x100da044) {
+				m_worldSpeed = g_unk0x100da044;
+			}
+
+			m_destEdge = LegoPathController::GetControlEdgeA(15);
+			m_boundary = LegoPathController::GetControlBoundaryA(15);
+		}
+
+		if (m_actorState == c_one) {
+			if (m_userNavFlag) {
+				m_unk0xe4 = 0.5f;
+			}
+
+			v1 = m_destEdge->CCWVertex(*m_boundary);
+			v2 = m_destEdge->CWVertex(*m_boundary);
+			assert(v1 && v2);
+
+			LERP3(a, *v1, *v2, m_unk0xe4);
+
+			m_destEdge->FUN_1002ddc0(*m_boundary, bbb);
+			c.EqualsCross(bbb, *m_boundary->GetUnknown0x14());
+			c.Unitize();
+
+			Mx3DPointFloat worldDirection(m_roi->GetWorldDirection());
+
+			if (!m_userNavFlag) {
+				worldDirection *= -1.0f;
+			}
+
+			if (VTable0x80(m_roi->GetWorldPosition(), worldDirection, a, c)) {
+#ifndef BETA10
+				m_unk0x7c = 0;
+				return 0;
+#else
+				assert(0);
+				return -1;
+#endif
+			}
+
+			m_unk0x7c = 0;
+			return 0;
+		}
+		else {
+			return 1;
+		}
+	}
+}
+
+// FUNCTION: LEGO1 0x10081550
+void LegoJetskiRaceActor::Animate(float p_time)
+{
+	if (m_unk0x0c == 0) {
+		const LegoChar* raceState = VariableTable()->GetVariable(g_raceState);
+		if (!stricmp(raceState, g_racing)) {
+			m_unk0x0c = 1;
+			m_lastTime = p_time - 1.0f;
+			m_unk0x1c = p_time;
+		}
+		else if (!m_userNavFlag) {
+			LegoAnimActor::Animate(m_lastTime + 1.0f);
+		}
+	}
+
+	if (m_unk0x0c == 1) {
+		LegoAnimActor::Animate(p_time);
+	}
+}
+
 // FUNCTION: LEGO1 0x10081840
 // FUNCTION: BETA10 0x100cf680
-MxU32 LegoCarRaceActor::VTable0x6c(
+inline MxU32 LegoCarRaceActor::VTable0x6c(
 	LegoPathBoundary* p_boundary,
 	Vector3& p_v1,
 	Vector3& p_v2,
@@ -383,3 +512,50 @@ MxU32 LegoCarRaceActor::VTable0x6c(

 	return 0;
 }
+
+// FUNCTION: LEGO1 0x10081fd0
+inline MxU32 LegoJetskiRaceActor::VTable0x6c(
+	LegoPathBoundary* p_boundary,
+	Vector3& p_v1,
+	Vector3& p_v2,
+	float p_f1,
+	float p_f2,
+	Vector3& p_v3
+)
+{
+	LegoAnimPresenterSet& presenters = p_boundary->GetPresenters();
+
+	for (LegoAnimPresenterSet::iterator itap = presenters.begin(); itap != presenters.end(); itap++) {
+		if ((*itap)->VTable0x94(p_v1, p_v2, p_f1, p_f2, p_v3)) {
+			return 1;
+		}
+	}
+
+	LegoPathActorSet& plpas = p_boundary->GetActors();
+	LegoPathActorSet lpas(plpas);
+
+	for (LegoPathActorSet::iterator itpa = lpas.begin(); itpa != lpas.end(); itpa++) {
+		if (plpas.find(*itpa) != plpas.end()) {
+			LegoPathActor* actor = *itpa;
+
+			if (this != actor) {
+				LegoROI* roi = actor->GetROI();
+
+				if (roi != NULL && (roi->GetVisibility() || actor->GetCameraFlag())) {
+					if (roi->FUN_100a9410(p_v1, p_v2, p_f1, p_f2, p_v3, m_collideBox && actor->GetCollideBox())) {
+						HitActor(actor, TRUE);
+
+						if (actor->HitActor(this, FALSE) < 0) {
+							return 0;
+						}
+						else {
+							return 2;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return 0;
+}