isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2024-11-26 01:28:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Implement/match Ambulance::HandleEndAction (#1018)

Browse source
This commit is contained in:
Christian Semmler 2024-06-11 13:12:02 -04:00 committed by GitHub
parent 9383076e04
commit 5311951bc7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 127 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
LEGO1/lego/legoomni/include/ambulance.h
View file

@ -105,20 +105,22 @@ class Ambulance : public IslePathActor {
// Ambulance::`scalar deleting destructor' // Ambulance::`scalar deleting destructor'
private: private:
void StopAction(MxS32 p_entityId); void PlayAnimation(IsleScript::Script p_objectId);
void StopAction(IsleScript::Script p_objectId);
void PlayAction(IsleScript::Script p_objectId);
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
MxS16 m_unk0x16a; // 0x16a MxS16 m_unk0x16a; // 0x16a
MxS16 m_unk0x16c; // 0x16c MxS16 m_unk0x16c; // 0x16c
MxS16 m_unk0x16e; // 0x16e MxS16 m_unk0x16e; // 0x16e
MxS16 m_unk0x170; // 0x170 MxS16 m_unk0x170; // 0x170
MxS16 m_unk0x172; // 0x172 MxS16 m_unk0x172; // 0x172
MxS32 m_unk0x174; // 0x174 IsleScript::Script m_lastAction; // 0x174
MxS32 m_unk0x178; // 0x178 IsleScript::Script m_lastAnimation; // 0x178
MxFloat m_unk0x17c; // 0x17c MxFloat m_unk0x17c; // 0x17c
MxFloat m_time; // 0x180 MxFloat m_time; // 0x180
}; };
#endif // AMBULANCE_H #endif // AMBULANCE_H

2
LEGO1/lego/legoomni/include/islepathactor.h
View file

@ -123,7 +123,7 @@ class IslePathActor : public LegoPathActor {
virtual void Enter(); // vtable+0xe0 virtual void Enter(); // vtable+0xe0
virtual void Exit(); // vtable+0xe4 virtual void Exit(); // vtable+0xe4
virtual void SpawnPlayer(LegoGameState::Area p_area, MxBool p_und, MxU8 p_flags); // vtable+0xe8 virtual void SpawnPlayer(LegoGameState::Area p_area, MxBool p_enter, MxU8 p_flags); // vtable+0xe8
virtual void VTable0xec(MxMatrix p_transform, LegoPathBoundary* p_boundary, MxBool p_reset); // vtable+0xec virtual void VTable0xec(MxMatrix p_transform, LegoPathBoundary* p_boundary, MxBool p_reset); // vtable+0xec
// SYNTHETIC: LEGO1 0x10002ff0 // SYNTHETIC: LEGO1 0x10002ff0

118
LEGO1/lego/legoomni/src/actors/ambulance.cpp
View file

@ -2,12 +2,15 @@
#include "decomp.h" #include "decomp.h"
#include "isle_actions.h" #include "isle_actions.h"
#include "legoanimationmanager.h"
#include "legocontrolmanager.h" #include "legocontrolmanager.h"
#include "legogamestate.h" #include "legogamestate.h"
#include "legoutils.h" #include "legoutils.h"
#include "legovariables.h" #include "legovariables.h"
#include "legoworld.h" #include "legoworld.h"
#include "misc.h" #include "misc.h"
#include "mxactionnotificationparam.h"
#include "mxbackgroundaudiomanager.h"
#include "mxmisc.h" #include "mxmisc.h"
#include "mxticklemanager.h" #include "mxticklemanager.h"
#include "mxtimer.h" #include "mxtimer.h"
@ -28,9 +31,9 @@ Ambulance::Ambulance()
m_unk0x16c = 0; m_unk0x16c = 0;
m_unk0x16e = 0; m_unk0x16e = 0;
m_unk0x170 = 0; m_unk0x170 = 0;
m_unk0x174 = -1; m_lastAction = IsleScript::c_noneIsle;
m_unk0x172 = 0; m_unk0x172 = 0;
m_unk0x178 = -1; m_lastAnimation = IsleScript::c_noneIsle;
m_unk0x17c = 1.0; m_unk0x17c = 1.0;
} }
@ -124,12 +127,90 @@ MxLong Ambulance::Notify(MxParam& p_param)
return result; return result;
} }
// STUB: LEGO1 0x100364d0 // FUNCTION: LEGO1 0x100364d0
// FUNCTION: BETA10 0x10022cc2 // FUNCTION: BETA10 0x10022cc2
MxLong Ambulance::HandleEndAction(MxEndActionNotificationParam& p_param) MxLong Ambulance::HandleEndAction(MxEndActionNotificationParam& p_param)
{ {
// TODO if (p_param.GetAction() != NULL) {
return 0; IsleScript::Script objectId = (IsleScript::Script) p_param.GetAction()->GetObjectId();
if (m_lastAnimation == objectId) {
m_lastAnimation = IsleScript::c_noneIsle;
}
if (m_lastAction == objectId) {
if (m_lastAnimation == IsleScript::c_noneIsle) {
BackgroundAudioManager()->RaiseVolume();
}
m_lastAction = IsleScript::c_noneIsle;
}
else if (objectId == IsleScript::c_hho027en_RunAnim) {
m_state->m_unk0x08 = 1;
CurrentWorld()->PlaceActor(CurrentActor());
HandleClick();
m_unk0x172 = 0;
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) {
if (m_unk0x170 == 3) {
PlayAnimation(IsleScript::c_hpz055pa_RunAnim);
m_unk0x170 = 0;
}
else {
PlayAnimation(IsleScript::c_hpz053pa_RunAnim);
}
}
else if (objectId == IsleScript::c_hpz050bd_RunAnim || objectId == IsleScript::c_hpz052ma_RunAnim) {
if (m_unk0x170 == 3) {
PlayAnimation(IsleScript::c_hpz057ma_RunAnim);
m_unk0x170 = 0;
}
else {
PlayAnimation(IsleScript::c_hpz052ma_RunAnim);
}
}
else if (objectId == IsleScript::c_hpz055pa_RunAnim || objectId == IsleScript::c_hpz057ma_RunAnim) {
CurrentWorld()->PlaceActor(CurrentActor());
HandleClick();
SpawnPlayer(LegoGameState::e_pizzeriaExterior, TRUE, 0);
m_unk0x172 = 0;
TickleManager()->RegisterClient(this, 40000);
if (m_unk0x16c != 0) {
StopActions();
}
}
else if (objectId == IsleScript::c_hps116bd_RunAnim || objectId == IsleScript::c_hps118re_RunAnim) {
if (objectId == IsleScript::c_hps116bd_RunAnim && m_unk0x170 != 3) {
PlayAction(IsleScript::c_Avo923In_PlayWav);
}
if (m_unk0x170 == 3) {
PlayAnimation(IsleScript::c_hps117bd_RunAnim);
m_unk0x170 = 0;
}
else {
PlayAnimation(IsleScript::c_hps118re_RunAnim);
}
}
else if (objectId == IsleScript::c_hps117bd_RunAnim) {
CurrentWorld()->PlaceActor(CurrentActor());
HandleClick();
SpawnPlayer(LegoGameState::e_unk33, TRUE, 0);
m_unk0x172 = 0;
TickleManager()->RegisterClient(this, 40000);
if (m_unk0x16e != 0) {
StopActions();
}
}
else if (objectId == IsleScript::c_hho142cl_RunAnim || objectId == IsleScript::c_hho143cl_RunAnim || objectId == IsleScript::c_hho144cl_RunAnim) {
FUN_10037250();
}
}
return 1;
} }
// STUB: LEGO1 0x100367c0 // STUB: LEGO1 0x100367c0
@ -197,14 +278,33 @@ void Ambulance::FUN_10037250()
// TODO // TODO
} }
// FUNCTION: LEGO1 0x10037340 // FUNCTION: LEGO1 0x100372e0
void Ambulance::StopAction(MxS32 p_entityId) // FUNCTION: BETA10 0x100241a0
void Ambulance::PlayAnimation(IsleScript::Script p_objectId)
{ {
if (p_entityId != -1) { AnimationManager()->FUN_10060dc0(p_objectId, NULL, TRUE, FALSE, NULL, FALSE, FALSE, FALSE, TRUE);
InvokeAction(Extra::e_stop, *g_isleScript, p_entityId, NULL); m_lastAnimation = p_objectId;
}
// FUNCTION: LEGO1 0x10037340
void Ambulance::StopAction(IsleScript::Script p_objectId)
{
if (p_objectId != -1) {
InvokeAction(Extra::e_stop, *g_isleScript, p_objectId, NULL);
} }
} }
// FUNCTION: LEGO1 0x10037360
void Ambulance::PlayAction(IsleScript::Script p_objectId)
{
if (p_objectId != -1) {
InvokeAction(Extra::e_start, *g_isleScript, p_objectId, NULL);
}
m_lastAction = p_objectId;
BackgroundAudioManager()->LowerVolume();
}
// FUNCTION: LEGO1 0x100373a0 // FUNCTION: LEGO1 0x100373a0
AmbulanceMissionState::AmbulanceMissionState() AmbulanceMissionState::AmbulanceMissionState()
{ {

4
LEGO1/lego/legoomni/src/actors/islepathactor.cpp
View file

@ -510,7 +510,7 @@ void IslePathActor::RegisterSpawnLocations()
// FUNCTION: LEGO1 0x1001b2a0 // FUNCTION: LEGO1 0x1001b2a0
// FUNCTION: BETA10 0x100369c6 // FUNCTION: BETA10 0x100369c6
void IslePathActor::SpawnPlayer(LegoGameState::Area p_area, MxBool p_und, MxU8 p_flags) void IslePathActor::SpawnPlayer(LegoGameState::Area p_area, MxBool p_enter, MxU8 p_flags)
{ {
MxS16 i; MxS16 i;
@ -531,7 +531,7 @@ void IslePathActor::SpawnPlayer(LegoGameState::Area p_area, MxBool p_und, MxU8 p
m_world = world; m_world = world;
if (p_und) { if (p_enter) {
Enter(); Enter();
} }