From 8087fdf3e977cd6062bf86aa70d0184ac6a77ef8 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Fri, 15 Nov 2024 10:29:50 -0700 Subject: [PATCH] Rename function --- LEGO1/lego/legoomni/include/legoutils.h | 2 +- LEGO1/lego/legoomni/src/actors/ambulance.cpp | 2 +- LEGO1/lego/legoomni/src/common/legoutils.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legoutils.h b/LEGO1/lego/legoomni/include/legoutils.h index b268bd4f..e0353ba7 100644 --- a/LEGO1/lego/legoomni/include/legoutils.h +++ b/LEGO1/lego/legoomni/include/legoutils.h @@ -42,7 +42,7 @@ extern MxAtomId* g_isleScript; LegoEntity* PickEntity(MxLong p_x, MxLong p_y); LegoROI* PickROI(MxLong p_x, MxLong p_y); -LegoROI* PickParentROI(MxLong p_x, MxLong p_y); +LegoROI* PickRootROI(MxLong p_x, MxLong p_y); void RotateY(LegoROI* p_roi, MxFloat p_angle); MxBool SpheresIntersect(const BoundingSphere& p_sphere1, const BoundingSphere& p_sphere2); MxBool FUN_1003ded0(MxFloat p_param1[2], MxFloat p_param2[3], MxFloat p_param3[3]); diff --git a/LEGO1/lego/legoomni/src/actors/ambulance.cpp b/LEGO1/lego/legoomni/src/actors/ambulance.cpp index 22d34e74..8d2d8374 100644 --- a/LEGO1/lego/legoomni/src/actors/ambulance.cpp +++ b/LEGO1/lego/legoomni/src/actors/ambulance.cpp @@ -253,7 +253,7 @@ MxLong Ambulance::HandleButtonDown(LegoControlManagerNotificationParam& p_param) return 1; } - roi = PickParentROI(p_param.GetX(), p_param.GetY()); + roi = PickRootROI(p_param.GetX(), p_param.GetY()); if (roi != NULL && !strcmpi(roi->GetName(), "gd")) { m_unk0x170 = 3; diff --git a/LEGO1/lego/legoomni/src/common/legoutils.cpp b/LEGO1/lego/legoomni/src/common/legoutils.cpp index f42d4e92..b1579d2f 100644 --- a/LEGO1/lego/legoomni/src/common/legoutils.cpp +++ b/LEGO1/lego/legoomni/src/common/legoutils.cpp @@ -45,7 +45,7 @@ LegoROI* PickROI(MxLong p_x, MxLong p_y) // FUNCTION: LEGO1 0x1003dd90 // FUNCTION: BETA10 0x100d3449 -LegoROI* PickParentROI(MxLong p_x, MxLong p_y) +LegoROI* PickRootROI(MxLong p_x, MxLong p_y) { LegoVideoManager* videoManager = VideoManager(); Lego3DView* view = videoManager->Get3DManager()->GetLego3DView(); @@ -61,7 +61,7 @@ LegoROI* PickParentROI(MxLong p_x, MxLong p_y) // FUNCTION: LEGO1 0x1003ddc0 LegoEntity* PickEntity(MxLong p_x, MxLong p_y) { - LegoROI* roi = PickParentROI(p_x, p_y); + LegoROI* roi = PickRootROI(p_x, p_y); if (roi == NULL) { return NULL;