From 2a55bc9e3960ac94e550d505195e0e9681de7978 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Mon, 9 Dec 2024 15:34:35 -0700 Subject: [PATCH] Rename --- LEGO1/lego/legoomni/include/act3.h | 4 ++-- LEGO1/lego/legoomni/src/actors/helicopter.cpp | 4 ++-- LEGO1/lego/legoomni/src/worlds/act3.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LEGO1/lego/legoomni/include/act3.h b/LEGO1/lego/legoomni/include/act3.h index f73eecfc..8df70e22 100644 --- a/LEGO1/lego/legoomni/include/act3.h +++ b/LEGO1/lego/legoomni/include/act3.h @@ -106,8 +106,8 @@ class Act3 : public LegoWorld { // SYNTHETIC: LEGO1 0x10072630 // Act3::`scalar deleting destructor' - MxResult LaunchPizza(LegoPathController* p_controller, Vector3& p_location, Vector3& p_direction, Vector3& p_up); - MxResult LaunchDonut(LegoPathController* p_controller, Vector3& p_location, Vector3& p_direction, Vector3& p_up); + MxResult ShootPizza(LegoPathController* p_controller, Vector3& p_location, Vector3& p_direction, Vector3& p_up); + MxResult ShootDonut(LegoPathController* p_controller, Vector3& p_location, Vector3& p_direction, Vector3& p_up); void FUN_10073400(); void FUN_10073430(); diff --git a/LEGO1/lego/legoomni/src/actors/helicopter.cpp b/LEGO1/lego/legoomni/src/actors/helicopter.cpp index 88c42f1b..b7942dad 100644 --- a/LEGO1/lego/legoomni/src/actors/helicopter.cpp +++ b/LEGO1/lego/legoomni/src/actors/helicopter.cpp @@ -249,13 +249,13 @@ MxLong Helicopter::HandleControl(LegoControlManagerNotificationParam& p_param) up.EqualsCross(&va4, &v90); if (isPizza) { - if (((Act3*) m_world)->LaunchPizza(m_pathController, location, direction, up) != SUCCESS) { + if (((Act3*) m_world)->ShootPizza(m_pathController, location, direction, up) != SUCCESS) { MxTrace("Shoot pizza failed\n"); break; } } else { - if (((Act3*) m_world)->LaunchDonut(m_pathController, location, direction, up) != SUCCESS) { + if (((Act3*) m_world)->ShootDonut(m_pathController, location, direction, up) != SUCCESS) { MxTrace("Shoot donut failed\n"); break; } diff --git a/LEGO1/lego/legoomni/src/worlds/act3.cpp b/LEGO1/lego/legoomni/src/worlds/act3.cpp index 8a12862a..da17628b 100644 --- a/LEGO1/lego/legoomni/src/worlds/act3.cpp +++ b/LEGO1/lego/legoomni/src/worlds/act3.cpp @@ -126,7 +126,7 @@ Act3::~Act3() // FUNCTION: LEGO1 0x100727e0 // FUNCTION: BETA10 0x100158e2 -MxResult Act3::LaunchPizza(LegoPathController* p_controller, Vector3& p_location, Vector3& p_direction, Vector3& p_up) +MxResult Act3::ShootPizza(LegoPathController* p_controller, Vector3& p_location, Vector3& p_direction, Vector3& p_up) { MxS32 nextPizza; for (nextPizza = 0; nextPizza < (MxS32) sizeOfArray(m_pizzas); nextPizza++) { @@ -182,7 +182,7 @@ MxResult Act3::LaunchPizza(LegoPathController* p_controller, Vector3& p_location // FUNCTION: LEGO1 0x10072980 // FUNCTION: BETA10 0x10015c69 -MxResult Act3::LaunchDonut(LegoPathController* p_controller, Vector3& p_location, Vector3& p_direction, Vector3& p_up) +MxResult Act3::ShootDonut(LegoPathController* p_controller, Vector3& p_location, Vector3& p_direction, Vector3& p_up) { MxS32 nextDonut; for (nextDonut = 0; nextDonut < (MxS32) sizeOfArray(m_donuts); nextDonut++) {