From f4d17f32b3d261fca532532ef58c2e29fa782a2a Mon Sep 17 00:00:00 2001
From: disinvite <disinvite@users.noreply.github.com>
Date: Mon, 10 Jun 2024 12:16:34 -0400
Subject: [PATCH] Fix LegoJetski

---
 LEGO1/lego/legoomni/include/legojetski.h      | 19 +++----
 LEGO1/lego/legoomni/src/entity/legojetski.cpp | 56 ++++++++++---------
 2 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legojetski.h b/LEGO1/lego/legoomni/include/legojetski.h
index 30000b5d..51a4d524 100644
--- a/LEGO1/lego/legoomni/include/legojetski.h
+++ b/LEGO1/lego/legoomni/include/legojetski.h
@@ -4,28 +4,27 @@
 #include "legojetskiraceactor.h"
 #include "legoracemap.h"
 
-/*
-	VTABLE: LEGO1 0x100d5a08 LegoJetskiRaceActor
-	VTABLE: LEGO1 0x100d5a28 LegoRaceActor
-	VTABLE: LEGO1 0x100d5a30 LegoAnimActor
-	VTABLE: LEGO1 0x100d5a40 LegoPathActor
-	VTABLE: LEGO1 0x100d5b10 LegoRaceMap
-*/
+// VTABLE: LEGO1 0x100d5a08 LegoJetskiRaceActor
+// VTABLE: LEGO1 0x100d5a28 LegoRaceActor
+// VTABLE: LEGO1 0x100d5a30 LegoAnimActor
+// VTABLE: LEGO1 0x100d5a40 LegoPathActor
+// VTABLE: LEGO1 0x100d5b10 LegoRaceMap
 // SIZE 0x1dc
 class LegoJetski : public LegoJetskiRaceActor, public LegoRaceMap {
 public:
 	LegoJetski();
+	~LegoJetski() override;
 
 	MxLong Notify(MxParam& p_param) override; // vtable+0x04
 
-	// FUNCTION: LEGO1 0x10013e80
+	// FUNCTION: LEGO1 0x10013e90
 	inline const char* ClassName() const override // vtable+0x0c
 	{
 		// STRING: LEGO1 0x100f053c
 		return "LegoJetski";
 	}
 
-	// FUNCTION: LEGO1 0x10013ea0
+	// FUNCTION: LEGO1 0x10013eb0
 	inline MxBool IsA(const char* p_name) const override // vtable+0x10
 	{
 		return !strcmp(p_name, LegoJetski::ClassName()) || LegoJetskiRaceActor::IsA(p_name);
@@ -49,7 +48,7 @@ class LegoJetski : public LegoJetskiRaceActor, public LegoRaceMap {
 
 	virtual void FUN_100136f0(float p_worldSpeed);
 
-	// SYNTHETIC: LEGO1 0x10013e20
+	// SYNTHETIC: LEGO1 0x10013e30
 	// LegoJetski::`scalar deleting destructor'
 };
 
diff --git a/LEGO1/lego/legoomni/src/entity/legojetski.cpp b/LEGO1/lego/legoomni/src/entity/legojetski.cpp
index 5160ab25..42a7ed5b 100644
--- a/LEGO1/lego/legoomni/src/entity/legojetski.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legojetski.cpp
@@ -5,6 +5,12 @@
 
 DECOMP_SIZE_ASSERT(LegoJetski, 0x1dc)
 
+// STUB: LEGO1 0x100136a0
+void LegoJetski::SetWorldSpeed(MxFloat p_worldSpeed)
+{
+	// TODO
+}
+
 // FUNCTION: LEGO1 0x100136f0
 void LegoJetski::FUN_100136f0(float p_worldSpeed)
 {
@@ -18,32 +24,45 @@ void LegoJetski::FUN_100136f0(float p_worldSpeed)
 	}
 }
 
+// STUB: LEGO1 0x10013740
+void LegoJetski::VTable0x70(float p_float)
+{
+	// TODO
+}
+
 // FUNCTION: LEGO1 0x10013820
 LegoJetski::LegoJetski()
 {
 	NotificationManager()->Register(this);
 }
 
-// STUB: LEGO1 0x10013e70
+// STUB: LEGO1 0x10013aa0
+LegoJetski::~LegoJetski()
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10013bb0
+void LegoJetski::ParseAction(char*)
+{
+	// TODO
+}
+
+// STUB: LEGO1 0x10013c30
 MxLong LegoJetski::Notify(MxParam& p_param)
 {
 	// TODO
 	return 0;
 }
 
-// STUB: LEGO1 0x10014110
-void LegoJetski::ParseAction(char*)
+// STUB: LEGO1 0x10013c40
+MxResult LegoJetski::VTable0x94(LegoPathActor* p_actor, MxBool p_bool)
 {
 	// TODO
+	return 0;
 }
 
-// STUB: LEGO1 0x10014120
-void LegoJetski::SetWorldSpeed(MxFloat p_worldSpeed)
-{
-	// TODO
-}
-
-// STUB: LEGO1 0x10014140
+// STUB: LEGO1 0x10014150
 MxU32 LegoJetski::VTable0x6c(
 	LegoPathBoundary* p_boundary,
 	Vector3& p_v1,
@@ -57,26 +76,13 @@ MxU32 LegoJetski::VTable0x6c(
 	return 0;
 }
 
-// STUB: LEGO1 0x10014180
-void LegoJetski::VTable0x70(float p_float)
-{
-	// TODO
-}
-
-// STUB: LEGO1 0x100141b0
-MxResult LegoJetski::VTable0x94(LegoPathActor* p_actor, MxBool p_bool)
-{
-	// TODO
-	return 0;
-}
-
-// STUB: LEGO1 0x100141c0
+// STUB: LEGO1 0x100141d0
 void LegoJetski::SwitchBoundary(LegoPathBoundary*& p_boundary, LegoUnknown100db7f4*& p_edge, float& p_unk0xe4)
 {
 	// TODO
 }
 
-// STUB: LEGO1 0x10014200
+// STUB: LEGO1 0x10014210
 MxResult LegoJetski::VTable0x9c()
 {
 	// TODO