From 541cf95012914e67b74db2d988443acea67c6708 Mon Sep 17 00:00:00 2001
From: Nathan <tahgtahv@gmail.com>
Date: Mon, 25 Mar 2024 20:07:12 -0400
Subject: [PATCH] Name changes (deviation from original source)

---
 LEGO1/lego/legoomni/include/legoanimactor.h     |  7 +++----
 LEGO1/lego/legoomni/include/legopathactor.h     |  2 +-
 LEGO1/lego/legoomni/src/paths/legoanimactor.cpp | 16 ++++++++--------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legoanimactor.h b/LEGO1/lego/legoomni/include/legoanimactor.h
index ce1c94b5..a9b27e9f 100644
--- a/LEGO1/lego/legoomni/include/legoanimactor.h
+++ b/LEGO1/lego/legoomni/include/legoanimactor.h
@@ -4,15 +4,14 @@
 #include "decomp.h"
 #include "lego/sources/anim/legoanim.h"
 #include "legopathactor.h"
-#include "mxstl/mxstl.h"
 
 // SIZE 0x20
 struct LegoAnimActorStruct {
-	LegoAnimActorStruct(float p_float, LegoAnim* p_LegoAnimPtr, LegoROI** p_roiMap, MxU32 p_numROIs);
+	LegoAnimActorStruct(float p_float, LegoAnim* p_animTreePtr, LegoROI** p_roiMap, MxU32 p_numROIs);
 	~LegoAnimActorStruct();
 	float GetDuration();
 	float m_unk0x00;         // 0x00
-	LegoAnim* m_AnimTreePtr; // 0x04
+	LegoAnim* m_animTreePtr; // 0x04
 	LegoROI** m_roiMap;      // 0x08
 	MxU32 m_numROIs;         // 0x0c
 	vector<void*> m_unk0x10; // 0x10
@@ -46,7 +45,7 @@ class LegoAnimActor : public virtual LegoPathActor {
 
 	virtual MxResult FUN_1001c1f0(float& p_out);
 	virtual MxResult FUN_1001c360(float, Matrix4& p_transform);
-	virtual MxResult FUN_1001c450(LegoAnim* p_AnimTreePtr, float p_float, LegoROI** p_roiMap, MxU32 p_numROIs);
+	virtual MxResult FUN_1001c450(LegoAnim* p_animTreePtr, float p_float, LegoROI** p_roiMap, MxU32 p_numROIs);
 	virtual void ClearMaps();
 
 	// SYNTHETIC: LEGO1 0x1000fb60
diff --git a/LEGO1/lego/legoomni/include/legopathactor.h b/LEGO1/lego/legoomni/include/legopathactor.h
index adff5952..012585be 100644
--- a/LEGO1/lego/legoomni/include/legopathactor.h
+++ b/LEGO1/lego/legoomni/include/legopathactor.h
@@ -95,7 +95,7 @@ class LegoPathActor : public LegoActor {
 	// LegoPathActor::`scalar deleting destructor'
 
 protected:
-	MxFloat m_BADuration;             // 0x78
+	MxFloat m_bADuration;             // 0x78
 	undefined4 m_unk0x7c;             // 0x7c
 	MxFloat m_unk0x80;                // 0x80
 	MxFloat m_unk0x84;                // 0x84
diff --git a/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp b/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
index df3a77d5..763cb48d 100644
--- a/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
+++ b/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
@@ -10,10 +10,10 @@ DECOMP_SIZE_ASSERT(LegoAnimActor, 0x174)
 DECOMP_SIZE_ASSERT(LegoAnimActorStruct, 0x20)
 
 // FUNCTION: LEGO1 0x1001bf80
-LegoAnimActorStruct::LegoAnimActorStruct(float p_float, LegoAnim* p_AnimTreePtr, LegoROI** p_roiMap, MxU32 p_numROIs)
+LegoAnimActorStruct::LegoAnimActorStruct(float p_float, LegoAnim* p_animTreePtr, LegoROI** p_roiMap, MxU32 p_numROIs)
 {
 	m_unk0x00 = p_float;
-	m_AnimTreePtr = p_AnimTreePtr;
+	m_animTreePtr = p_animTreePtr;
 	m_roiMap = p_roiMap;
 	m_numROIs = p_numROIs;
 }
@@ -29,7 +29,7 @@ LegoAnimActorStruct::~LegoAnimActorStruct()
 // FUNCTION: LEGO1 0x1001c130
 float LegoAnimActorStruct::GetDuration()
 {
-	return m_AnimTreePtr->GetDuration();
+	return m_animTreePtr->GetDuration();
 }
 
 // FUNCTION: LEGO1 0x1001c140
@@ -45,8 +45,8 @@ LegoAnimActor::~LegoAnimActor()
 // FUNCTION: LEGO1 0x1001c1f0
 MxResult LegoAnimActor::FUN_1001c1f0(float& p_out)
 {
-	p_out = m_unk0x80 - (float) m_animMaps[m_curAnim]->m_AnimTreePtr->GetDuration() *
-							((int) (m_unk0x80 / (float) m_animMaps[m_curAnim]->m_AnimTreePtr->GetDuration()));
+	p_out = m_unk0x80 - (float) m_animMaps[m_curAnim]->m_animTreePtr->GetDuration() *
+							((int) (m_unk0x80 / (float) m_animMaps[m_curAnim]->m_animTreePtr->GetDuration()));
 	return SUCCESS;
 }
 
@@ -89,7 +89,7 @@ MxResult LegoAnimActor::FUN_1001c360(float p_float, Matrix4& p_transform)
 		LegoROI** roiMap = anim->m_roiMap;
 		MxU32 numROIs = anim->m_numROIs;
 		if (m_boundary->GetFlag0x10()) {
-			LegoTreeNode* root = anim->m_AnimTreePtr->GetRoot();
+			LegoTreeNode* root = anim->m_animTreePtr->GetRoot();
 			m_roi->SetVisibility(TRUE);
 			for (MxU32 i = 0; i < numROIs; i++) {
 				if (roiMap[i] && (roiMap[i] != m_roi)) {
@@ -119,9 +119,9 @@ MxResult LegoAnimActor::FUN_1001c360(float p_float, Matrix4& p_transform)
 }
 
 // FUNCTION: LEGO1 0x1001c450
-MxResult LegoAnimActor::FUN_1001c450(LegoAnim* p_AnimTreePtr, float p_float, LegoROI** p_roiMap, MxU32 p_numROIs)
+MxResult LegoAnimActor::FUN_1001c450(LegoAnim* p_animTreePtr, float p_float, LegoROI** p_roiMap, MxU32 p_numROIs)
 {
-	LegoAnimActorStruct* laas = new LegoAnimActorStruct(p_float, p_AnimTreePtr, p_roiMap, p_numROIs);
+	LegoAnimActorStruct* laas = new LegoAnimActorStruct(p_float, p_animTreePtr, p_roiMap, p_numROIs);
 	for (vector<LegoAnimActorStruct*>::iterator it = m_animMaps.begin(); it != m_animMaps.end(); it++) {
 		if (p_float < (*it)->m_unk0x00) {
 			m_animMaps.insert(it, laas);