TheCloud/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-09-23 03:55:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match Ambulance::StopScriptOnAmbulance and StopScriptOnEntity (#1003)

Browse Source 
* Match Ambulance::StopScriptOnAmbulance and StopScriptOnEntity

* Rename for consistency

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Joshua Peisach 2024-06-08 17:40:36 -04:00 committed by GitHub
parent 14a2aaadea
commit b7b0b7f50a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 6 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,13 +98,15 @@ public:
void CreateState(); void CreateState();
void FUN_10036e60(); void FUN_10036e60();
void FUN_10037060(); void FUN_10037060();
void FUN_10037240(); 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 StopAction(MxS32 p_entityId);
undefined m_unk0x160[4]; // 0x160 undefined m_unk0x160[4]; // 0x160
AmbulanceMissionState* m_state; // 0x164 AmbulanceMissionState* m_state; // 0x164
MxS16 m_unk0x168; // 0x168 MxS16 m_unk0x168; // 0x168

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

@ -1,8 +1,10 @@
#include "ambulance.h" #include "ambulance.h"
#include "decomp.h" #include "decomp.h"
#include "isle_actions.h"
#include "legocontrolmanager.h" #include "legocontrolmanager.h"
#include "legogamestate.h" #include "legogamestate.h"
#include "legoutils.h"
#include "legovariables.h" #include "legovariables.h"
#include "legoworld.h" #include "legoworld.h"
#include "misc.h" #include "misc.h"
@ -123,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
@ -182,10 +185,10 @@ MxResult Ambulance::Tickle()
return SUCCESS; return SUCCESS;
} }
// STUB: LEGO1 0x10037240 // FUNCTION: LEGO1 0x10037240
void Ambulance::FUN_10037240() void Ambulance::StopActions()
{ {
// TODO StopAction(IsleScript::c_pns018rd_RunAnim);
} }
// STUB: LEGO1 0x10037250 // STUB: LEGO1 0x10037250
@ -194,6 +197,14 @@ void Ambulance::FUN_10037250()
// TODO // TODO
} }
// FUNCTION: LEGO1 0x10037340
void Ambulance::StopAction(MxS32 p_entityId)
{
if (p_entityId != -1) {
InvokeAction(Extra::e_stop, *g_isleScript, p_entityId, NULL);
}
}
// FUNCTION: LEGO1 0x100373a0 // FUNCTION: LEGO1 0x100373a0
AmbulanceMissionState::AmbulanceMissionState() AmbulanceMissionState::AmbulanceMissionState()
{ {

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->FUN_10037240(); 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->FUN_10037240(); m_ambulance->StopActions();
m_ambulance->FUN_10037250(); m_ambulance->FUN_10037250();
} }
} }