From 317aace275e661d0d554fc3d4330654cb56cfae5 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sun, 22 Dec 2024 11:35:19 -0700 Subject: [PATCH] Rename --- LEGO1/lego/legoomni/src/paths/legopathboundary.cpp | 6 +++--- LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp | 8 ++++---- LEGO1/lego/sources/geom/legowegedge.cpp | 6 +++--- LEGO1/lego/sources/geom/legowegedge.h | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp b/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp index 27ebf7da..87f1cbdc 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp @@ -48,7 +48,7 @@ void LegoPathBoundary::FUN_100575b0(Vector3& p_point1, Vector3& p_point2, LegoPa { Vector3* ccwV = NULL; - if (m_numPathTrigger > 0 && m_unk0x50 != NULL) { + if (m_numTriggers > 0 && m_unk0x50 != NULL) { ccwV = m_edges[0]->CCWVertex(*this); Mx3DPointFloat v; @@ -61,7 +61,7 @@ void LegoPathBoundary::FUN_100575b0(Vector3& p_point1, Vector3& p_point2, LegoPa float dot2 = v.Dot(&v, m_unk0x50); if (dot2 > dot1) { - for (MxS32 i = 0; i < m_numPathTrigger; i++) { + for (MxS32 i = 0; i < m_numTriggers; i++) { LegoPathStruct* s = m_pathTrigger[i].m_pathStruct; if (m_pathTrigger[i].m_unk0x08 >= dot1 && m_pathTrigger[i].m_unk0x08 < dot2) { @@ -70,7 +70,7 @@ void LegoPathBoundary::FUN_100575b0(Vector3& p_point1, Vector3& p_point2, LegoPa } } else if (dot2 < dot1) { - for (MxS32 i = 0; i < m_numPathTrigger; i++) { + for (MxS32 i = 0; i < m_numTriggers; i++) { LegoPathStruct* s = m_pathTrigger[i].m_pathStruct; if (m_pathTrigger[i].m_unk0x08 >= dot2 && m_pathTrigger[i].m_unk0x08 < dot1) { diff --git a/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp b/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp index 7f42b65f..a36a9a53 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp @@ -673,15 +673,15 @@ MxResult LegoPathController::ReadBoundaries(LegoStorage* p_storage) return FAILURE; } - if (p_storage->Read(&boundary.m_numPathTrigger, sizeof(boundary.m_numPathTrigger)) != SUCCESS) { + if (p_storage->Read(&boundary.m_numTriggers, sizeof(boundary.m_numTriggers)) != SUCCESS) { return FAILURE; } - if (boundary.m_numPathTrigger > 0) { + if (boundary.m_numTriggers > 0) { boundary.m_unk0x50 = new Mx3DPointFloat; - boundary.m_pathTrigger = new LegoWEGEdge::PathWithTrigger[boundary.m_numPathTrigger]; + boundary.m_pathTrigger = new LegoWEGEdge::PathWithTrigger[boundary.m_numTriggers]; - for (j = 0; j < boundary.m_numPathTrigger; j++) { + for (j = 0; j < boundary.m_numTriggers; j++) { if (p_storage->Read(&s, sizeof(s)) != SUCCESS) { return FAILURE; } diff --git a/LEGO1/lego/sources/geom/legowegedge.cpp b/LEGO1/lego/sources/geom/legowegedge.cpp index 9ceabd7a..6de4fd17 100644 --- a/LEGO1/lego/sources/geom/legowegedge.cpp +++ b/LEGO1/lego/sources/geom/legowegedge.cpp @@ -16,7 +16,7 @@ LegoWEGEdge::LegoWEGEdge() m_unk0x14.Clear(); m_edgeNormals = NULL; m_flags = 0; - m_numPathTrigger = 0; + m_numTriggers = 0; m_pathTrigger = NULL; m_unk0x50 = NULL; } @@ -151,7 +151,7 @@ LegoS32 LegoWEGEdge::VTable0x04() } } - if (m_numPathTrigger > 0) { + if (m_numTriggers > 0) { Vector3* vTrig1 = m_edges[0]->CCWVertex(*this); Vector3* vTrig2 = m_edges[1]->CCWVertex(*this); assert(vTrig1 && vTrig2); @@ -198,7 +198,7 @@ LegoS32 LegoWEGEdge::VTable0x04() local98 += 0.001; local9c -= 0.001; - for (LegoS32 j = 0; j < m_numPathTrigger; j++) { + for (LegoS32 j = 0; j < m_numTriggers; j++) { if (m_pathTrigger[j].m_unk0x08 < local98) { m_pathTrigger[j].m_unk0x08 = local98; } diff --git a/LEGO1/lego/sources/geom/legowegedge.h b/LEGO1/lego/sources/geom/legowegedge.h index 0203795f..77567bfe 100644 --- a/LEGO1/lego/sources/geom/legowegedge.h +++ b/LEGO1/lego/sources/geom/legowegedge.h @@ -81,7 +81,7 @@ class LegoWEGEdge : public LegoWEEdge { Mx4DPointFloat* m_edgeNormals; // 0x2c Mx3DPointFloat m_unk0x30; // 0x30 float m_unk0x44; // 0x44 - LegoU8 m_numPathTrigger; // 0x48 + LegoU8 m_numTriggers; // 0x48 PathWithTrigger* m_pathTrigger; // 0x4c Mx3DPointFloat* m_unk0x50; // 0x50 };