diff --git a/LEGO1/lego/legoomni/src/actors/radio.cpp b/LEGO1/lego/legoomni/src/actors/radio.cpp index f625e787..e78e7ba8 100644 --- a/LEGO1/lego/legoomni/src/actors/radio.cpp +++ b/LEGO1/lego/legoomni/src/actors/radio.cpp @@ -111,7 +111,7 @@ MxLong Radio::HandleControl(LegoControlManagerEvent& p_param) if (CurrentWorld()) { #ifdef COMPAT_MODE - MxNotificationParam param(c_notificationEndAction, this); + MxNotificationParam param(c_notificationType0, this); CurrentWorld()->Notify(param); #else CurrentWorld()->Notify(MxNotificationParam(c_notificationType0, this)); diff --git a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp index 39de0c7a..40afb7a3 100644 --- a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp @@ -2451,7 +2451,7 @@ MxBool LegoAnimationManager::FUN_10063fb0(LegoLocation::Boundary* p_boundary, Le MxBool LegoAnimationManager::FUN_10064010(LegoPathBoundary* p_boundary, LegoUnknown100db7f4* p_edge, float p_destScale) { Mx3DPointFloat p1; - Vector3* v1 = p_edge->GetOpposingPoint(*p_boundary); + Vector3* v1 = p_edge->CWVertex(*p_boundary); Vector3* v2 = p_edge->CCWVertex(*p_boundary); p1 = *v2; diff --git a/LEGO1/lego/legoomni/src/paths/legopathactor.cpp b/LEGO1/lego/legoomni/src/paths/legopathactor.cpp index 17d89e68..430914b2 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathactor.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathactor.cpp @@ -94,9 +94,9 @@ MxResult LegoPathActor::VTable0x88( float p_destScale ) { - Vector3* v1 = p_srcEdge.GetOpposingPoint(*p_boundary); + Vector3* v1 = p_srcEdge.CWVertex(*p_boundary); Vector3* v2 = p_srcEdge.CCWVertex(*p_boundary); - Vector3* v3 = p_destEdge.GetOpposingPoint(*p_boundary); + Vector3* v3 = p_destEdge.CWVertex(*p_boundary); Vector3* v4 = p_destEdge.CCWVertex(*p_boundary); Mx3DPointFloat p1, p2, p3, p4, p5; @@ -171,7 +171,7 @@ MxResult LegoPathActor::VTable0x84( float p_destScale ) { - Vector3* v3 = p_destEdge.GetOpposingPoint(*p_boundary); + Vector3* v3 = p_destEdge.CWVertex(*p_boundary); Vector3* v4 = p_destEdge.CCWVertex(*p_boundary); Mx3DPointFloat p2, p3, p5; @@ -624,7 +624,7 @@ MxResult LegoPathActor::VTable0x9c() if (local20 != 0) { Mx3DPointFloat local78; - Vector3& v1 = *m_destEdge->GetOpposingPoint(*m_boundary); + Vector3& v1 = *m_destEdge->CWVertex(*m_boundary); Vector3& v2 = *m_destEdge->CCWVertex(*m_boundary); LERP3(local34, v1, v2, m_unk0xe4); diff --git a/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp b/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp index 81108d61..bcd1875c 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathboundary.cpp @@ -231,7 +231,7 @@ MxU32 LegoPathBoundary::Intersect( Mx3DPointFloat local50; Mx3DPointFloat local70; - Vector3* local5c = e->GetOpposingPoint(*this); + Vector3* local5c = e->CWVertex(*this); p_point3 = vec; p_point3.Mul(localc); @@ -256,7 +256,7 @@ MxU32 LegoPathBoundary::Intersect( break; } - Vector3* local90 = local88->GetOpposingPoint(*this); + Vector3* local90 = local88->CWVertex(*this); Mx3DPointFloat locala4(p_point3); ((Vector3&) locala4).Sub(local90); @@ -283,7 +283,7 @@ MxU32 LegoPathBoundary::Intersect( break; } - Vector3* localc4 = locala8->GetOpposingPoint(*this); + Vector3* localc4 = locala8->CWVertex(*this); Mx3DPointFloat locald8(p_point3); ((Vector3&) locald8).Sub(localc4); diff --git a/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp b/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp index 3a5a763b..19fc04fd 100644 --- a/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp +++ b/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp @@ -756,9 +756,9 @@ MxS32 LegoPathController::FUN_1004a240( Mx3DPointFloat vec; p_v1 = *p_edge->CCWVertex(*p_boundary); - p_v1.Sub(p_edge->GetOpposingPoint(*p_boundary)); + p_v1.Sub(p_edge->CWVertex(*p_boundary)); p_v1.Mul(p_f1); - p_v1.Add(p_edge->GetOpposingPoint(*p_boundary)); + p_v1.Add(p_edge->CWVertex(*p_boundary)); p_edge->FUN_1002ddc0(*p_boundary, vec); p_v2.EqualsCross(p_boundary->GetUnknown0x14(), &vec); return 0; diff --git a/LEGO1/lego/sources/geom/legoedge.cpp b/LEGO1/lego/sources/geom/legoedge.cpp index 1788a0d7..7606d6a1 100644 --- a/LEGO1/lego/sources/geom/legoedge.cpp +++ b/LEGO1/lego/sources/geom/legoedge.cpp @@ -51,7 +51,7 @@ LegoEdge* LegoEdge::GetCounterclockwiseEdge(LegoWEEdge& p_face) } // FUNCTION: LEGO1 0x1009a510 -Vector3* LegoEdge::GetOpposingPoint(LegoWEEdge& p_face) +Vector3* LegoEdge::CWVertex(LegoWEEdge& p_face) { return &p_face == m_faceA ? m_pointB : m_pointA; } diff --git a/LEGO1/lego/sources/geom/legoedge.h b/LEGO1/lego/sources/geom/legoedge.h index 0f238c37..753d6e11 100644 --- a/LEGO1/lego/sources/geom/legoedge.h +++ b/LEGO1/lego/sources/geom/legoedge.h @@ -14,7 +14,7 @@ struct LegoEdge { LegoEdge* GetClockwiseEdge(LegoWEEdge& p_face); LegoEdge* GetCounterclockwiseEdge(LegoWEEdge& p_face); - Vector3* GetOpposingPoint(LegoWEEdge& p_face); + Vector3* CWVertex(LegoWEEdge& p_face); Vector3* CCWVertex(LegoWEEdge& p_face); LegoResult FUN_1002ddc0(LegoWEEdge& p_face, Vector3& p_point);