isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-26 17:51:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Rename for consistency

Browse Source
This commit is contained in:
Christian Semmler 2024-06-08 16:49:40 -04:00
parent bc42a72cd6
commit 7b0fa449f3
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/lego/legoomni/include/ambulance.h
View File

@ -98,14 +98,14 @@ class Ambulance : public IslePathActor {
void CreateState(); void CreateState();
void FUN_10036e60(); void FUN_10036e60();
void FUN_10037060(); void FUN_10037060();
void StopScriptOnAmbulance(); void StopActions();
void FUN_10037250(); void FUN_10037250();
// SYNTHETIC: LEGO1 0x10036130 // SYNTHETIC: LEGO1 0x10036130
// Ambulance::`scalar deleting destructor' // Ambulance::`scalar deleting destructor'
private: private:
void StopScriptOnEntity(MxS32 p_entityId); void StopAction(MxS32 p_entityId);
undefined m_unk0x160[4]; // 0x160 undefined m_unk0x160[4]; // 0x160
AmbulanceMissionState* m_state; // 0x164 AmbulanceMissionState* m_state; // 0x164

7
LEGO1/lego/legoomni/src/actors/ambulance.cpp
View File

@ -125,6 +125,7 @@ MxLong Ambulance::Notify(MxParam& p_param)
} }
// STUB: LEGO1 0x100364d0 // STUB: LEGO1 0x100364d0
// FUNCTION: BETA10 0x10022cc2
MxLong Ambulance::HandleEndAction(MxEndActionNotificationParam& p_param) MxLong Ambulance::HandleEndAction(MxEndActionNotificationParam& p_param)
{ {
// TODO // TODO
@ -185,9 +186,9 @@ MxResult Ambulance::Tickle()
} }
// FUNCTION: LEGO1 0x10037240 // FUNCTION: LEGO1 0x10037240
void Ambulance::StopScriptOnAmbulance() void Ambulance::StopActions()
{ {
StopScriptOnEntity(IsleScript::c_pns018rd_RunAnim); StopAction(IsleScript::c_pns018rd_RunAnim);
} }
// STUB: LEGO1 0x10037250 // STUB: LEGO1 0x10037250
@ -197,7 +198,7 @@ void Ambulance::FUN_10037250()
} }
// FUNCTION: LEGO1 0x10037340 // FUNCTION: LEGO1 0x10037340
void Ambulance::StopScriptOnEntity(MxS32 p_entityId) void Ambulance::StopAction(MxS32 p_entityId)
{ {
if (p_entityId != -1) { if (p_entityId != -1) {
InvokeAction(Extra::e_stop, *g_isleScript, p_entityId, NULL); InvokeAction(Extra::e_stop, *g_isleScript, p_entityId, NULL);

4
LEGO1/lego/legoomni/src/worlds/isle.cpp
View File

@ -1201,7 +1201,7 @@ MxBool Isle::Escape()
break; break;
case 10: case 10:
if (CurrentActor() != NULL && !CurrentActor()->IsA("Ambulance")) { if (CurrentActor() != NULL && !CurrentActor()->IsA("Ambulance")) {
m_ambulance->StopScriptOnAmbulance(); m_ambulance->StopActions();
m_ambulance->FUN_10037250(); m_ambulance->FUN_10037250();
} }
break; break;
@ -1242,7 +1242,7 @@ void Isle::FUN_10033350()
{ {
if (m_act1state->m_unk0x018 == 10) { if (m_act1state->m_unk0x018 == 10) {
if (CurrentActor() != NULL && !CurrentActor()->IsA("Ambulance")) { if (CurrentActor() != NULL && !CurrentActor()->IsA("Ambulance")) {
m_ambulance->StopScriptOnAmbulance(); m_ambulance->StopActions();
m_ambulance->FUN_10037250(); m_ambulance->FUN_10037250();
} }
} }