From 7b0fa449f3cd8b4095465d066eac600ebc52f692 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sat, 8 Jun 2024 16:49:40 -0400 Subject: [PATCH] Rename for consistency --- LEGO1/lego/legoomni/include/ambulance.h | 4 ++-- LEGO1/lego/legoomni/src/actors/ambulance.cpp | 7 ++++--- LEGO1/lego/legoomni/src/worlds/isle.cpp | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/LEGO1/lego/legoomni/include/ambulance.h b/LEGO1/lego/legoomni/include/ambulance.h index 8f72659b..54e163e8 100644 --- a/LEGO1/lego/legoomni/include/ambulance.h +++ b/LEGO1/lego/legoomni/include/ambulance.h @@ -98,14 +98,14 @@ class Ambulance : public IslePathActor { void CreateState(); void FUN_10036e60(); void FUN_10037060(); - void StopScriptOnAmbulance(); + void StopActions(); void FUN_10037250(); // SYNTHETIC: LEGO1 0x10036130 // Ambulance::`scalar deleting destructor' private: - void StopScriptOnEntity(MxS32 p_entityId); + void StopAction(MxS32 p_entityId); undefined m_unk0x160[4]; // 0x160 AmbulanceMissionState* m_state; // 0x164 diff --git a/LEGO1/lego/legoomni/src/actors/ambulance.cpp b/LEGO1/lego/legoomni/src/actors/ambulance.cpp index 75c84045..20d12b35 100644 --- a/LEGO1/lego/legoomni/src/actors/ambulance.cpp +++ b/LEGO1/lego/legoomni/src/actors/ambulance.cpp @@ -125,6 +125,7 @@ MxLong Ambulance::Notify(MxParam& p_param) } // STUB: LEGO1 0x100364d0 +// FUNCTION: BETA10 0x10022cc2 MxLong Ambulance::HandleEndAction(MxEndActionNotificationParam& p_param) { // TODO @@ -185,9 +186,9 @@ MxResult Ambulance::Tickle() } // FUNCTION: LEGO1 0x10037240 -void Ambulance::StopScriptOnAmbulance() +void Ambulance::StopActions() { - StopScriptOnEntity(IsleScript::c_pns018rd_RunAnim); + StopAction(IsleScript::c_pns018rd_RunAnim); } // STUB: LEGO1 0x10037250 @@ -197,7 +198,7 @@ void Ambulance::FUN_10037250() } // FUNCTION: LEGO1 0x10037340 -void Ambulance::StopScriptOnEntity(MxS32 p_entityId) +void Ambulance::StopAction(MxS32 p_entityId) { if (p_entityId != -1) { InvokeAction(Extra::e_stop, *g_isleScript, p_entityId, NULL); diff --git a/LEGO1/lego/legoomni/src/worlds/isle.cpp b/LEGO1/lego/legoomni/src/worlds/isle.cpp index 31c4b0d4..b96d5814 100644 --- a/LEGO1/lego/legoomni/src/worlds/isle.cpp +++ b/LEGO1/lego/legoomni/src/worlds/isle.cpp @@ -1201,7 +1201,7 @@ MxBool Isle::Escape() break; case 10: if (CurrentActor() != NULL && !CurrentActor()->IsA("Ambulance")) { - m_ambulance->StopScriptOnAmbulance(); + m_ambulance->StopActions(); m_ambulance->FUN_10037250(); } break; @@ -1242,7 +1242,7 @@ void Isle::FUN_10033350() { if (m_act1state->m_unk0x018 == 10) { if (CurrentActor() != NULL && !CurrentActor()->IsA("Ambulance")) { - m_ambulance->StopScriptOnAmbulance(); + m_ambulance->StopActions(); m_ambulance->FUN_10037250(); } }