mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 08:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clear remaining unknown in Ambulance (#1650)

Browse Source
This commit is contained in:
Fabian Neundorf
2025-07-23 19:14:10 +02:00
committed by GitHub
parent eae038f6a9
commit 2451b041f6
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -211,7 +211,7 @@ private:
MxS16 m_atPoliceTask; // 0x16c MxS16 m_atPoliceTask; // 0x16c
MxS16 m_atBeachTask; // 0x16e MxS16 m_atBeachTask; // 0x16e
MxS16 m_taskState; // 0x170 MxS16 m_taskState; // 0x170
MxS16 m_unk0x172; // 0x172 MxS16 m_enableRandomAudio; // 0x172
IsleScript::Script m_lastAction; // 0x174 IsleScript::Script m_lastAction; // 0x174
IsleScript::Script m_lastAnimation; // 0x178 IsleScript::Script m_lastAnimation; // 0x178
MxFloat m_fuel; // 0x17c MxFloat m_fuel; // 0x17c

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

@@ -41,7 +41,7 @@ Ambulance::Ambulance()
m_atBeachTask = 0; m_atBeachTask = 0;
m_taskState = Ambulance::e_none; m_taskState = Ambulance::e_none;
m_lastAction = IsleScript::c_noneIsle; m_lastAction = IsleScript::c_noneIsle;
m_unk0x172 = 0; m_enableRandomAudio = 0;
m_lastAnimation = IsleScript::c_noneIsle; m_lastAnimation = IsleScript::c_noneIsle;
m_fuel = 1.0; m_fuel = 1.0;
} }
@@ -173,7 +173,7 @@ MxLong Ambulance::HandleEndAction(MxEndActionNotificationParam& p_param)
m_state->m_state = AmbulanceMissionState::e_enteredAmbulance; m_state->m_state = AmbulanceMissionState::e_enteredAmbulance;
CurrentWorld()->PlaceActor(UserActor()); CurrentWorld()->PlaceActor(UserActor());
HandleClick(); HandleClick();
m_unk0x172 = 0; m_enableRandomAudio = 0;
TickleManager()->RegisterClient(this, 40000); TickleManager()->RegisterClient(this, 40000);
} }
else if (objectId == IsleScript::c_hpz047pe_RunAnim || objectId == IsleScript::c_hpz048pe_RunAnim || objectId == IsleScript::c_hpz049bd_RunAnim || objectId == IsleScript::c_hpz053pa_RunAnim) { else if (objectId == IsleScript::c_hpz047pe_RunAnim || objectId == IsleScript::c_hpz048pe_RunAnim || objectId == IsleScript::c_hpz049bd_RunAnim || objectId == IsleScript::c_hpz053pa_RunAnim) {
@@ -198,7 +198,7 @@ MxLong Ambulance::HandleEndAction(MxEndActionNotificationParam& p_param)
CurrentWorld()->PlaceActor(UserActor()); CurrentWorld()->PlaceActor(UserActor());
HandleClick(); HandleClick();
SpawnPlayer(LegoGameState::e_pizzeriaExterior, TRUE, 0); SpawnPlayer(LegoGameState::e_pizzeriaExterior, TRUE, 0);
m_unk0x172 = 0; m_enableRandomAudio = 0;
TickleManager()->RegisterClient(this, 40000); TickleManager()->RegisterClient(this, 40000);
if (m_atPoliceTask != 0) { if (m_atPoliceTask != 0) {
@@ -222,7 +222,7 @@ MxLong Ambulance::HandleEndAction(MxEndActionNotificationParam& p_param)
CurrentWorld()->PlaceActor(UserActor()); CurrentWorld()->PlaceActor(UserActor());
HandleClick(); HandleClick();
SpawnPlayer(LegoGameState::e_policeExited, TRUE, 0); SpawnPlayer(LegoGameState::e_policeExited, TRUE, 0);
m_unk0x172 = 0; m_enableRandomAudio = 0;
TickleManager()->RegisterClient(this, 40000); TickleManager()->RegisterClient(this, 40000);
if (m_atBeachTask != 0) { if (m_atBeachTask != 0) {
@@ -513,8 +513,8 @@ void Ambulance::ActivateSceneActions()
// FUNCTION: BETA10 0x100237df // FUNCTION: BETA10 0x100237df
MxResult Ambulance::Tickle() MxResult Ambulance::Tickle()
{ {
if (m_unk0x172 == 0) { if (m_enableRandomAudio == 0) {
m_unk0x172 = 1; m_enableRandomAudio = 1;
} }
else if (m_lastAction == IsleScript::c_noneIsle) { else if (m_lastAction == IsleScript::c_noneIsle) {
IsleScript::Script objectId; IsleScript::Script objectId;