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

Clear unknowns in PoliceState (#1551)

Browse Source
This commit is contained in:
Fabian Neundorf
2025-06-10 20:51:21 +02:00
committed by GitHub
parent 8cdc8fbc05
commit 180d4949da
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
LEGO1/lego/legoomni/include/police.h
View File

@@ -38,15 +38,15 @@ public:
// SYNTHETIC: LEGO1 0x1005e920 // SYNTHETIC: LEGO1 0x1005e920
// PoliceState::`scalar deleting destructor' // PoliceState::`scalar deleting destructor'
undefined4 GetUnknown0x0c() { return m_unk0x0c; } MxS32 GetPlayAnimation() { return m_playAnimation; }
void SetUnknown0x0c(undefined4 p_unk0x0c) { m_unk0x0c = p_unk0x0c; } void SetPlayAnimation(MxS32 p_playAnimation) { m_playAnimation = p_playAnimation; }
void FUN_1005ea40(); void StartAnimation();
// TODO: Most likely getters/setters are not used according to BETA. // TODO: Most likely getters/setters are not used according to BETA.
PoliceScript::Script m_policeScript; // 0x08 PoliceScript::Script m_policeScript; // 0x08
undefined4 m_unk0x0c; // 0x0c MxS32 m_playAnimation; // 0x0c
}; };
// VTABLE: LEGO1 0x100d8a80 // VTABLE: LEGO1 0x100d8a80

24
LEGO1/lego/legoomni/src/worlds/police.cpp
View File

@@ -105,7 +105,7 @@ MxLong Police::HandleControl(LegoControlManagerNotificationParam& p_param)
switch (p_param.m_clickedObjectId) { switch (p_param.m_clickedObjectId) {
case PoliceScript::c_LeftArrow_Ctl: case PoliceScript::c_LeftArrow_Ctl:
case PoliceScript::c_RightArrow_Ctl: case PoliceScript::c_RightArrow_Ctl:
if (m_policeState->GetUnknown0x0c() == 1) { if (m_policeState->GetPlayAnimation() == 1) {
DeleteObjects(&m_atomId, PoliceScript::c_nps001ni_RunAnim, PoliceScript::c_nps002la_RunAnim); DeleteObjects(&m_atomId, PoliceScript::c_nps001ni_RunAnim, PoliceScript::c_nps002la_RunAnim);
} }
@@ -114,7 +114,7 @@ MxLong Police::HandleControl(LegoControlManagerNotificationParam& p_param)
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
break; break;
case PoliceScript::c_Info_Ctl: case PoliceScript::c_Info_Ctl:
if (m_policeState->GetUnknown0x0c() == 1) { if (m_policeState->GetPlayAnimation() == 1) {
DeleteObjects(&m_atomId, PoliceScript::c_nps001ni_RunAnim, PoliceScript::c_nps002la_RunAnim); DeleteObjects(&m_atomId, PoliceScript::c_nps001ni_RunAnim, PoliceScript::c_nps002la_RunAnim);
} }
@@ -123,7 +123,7 @@ MxLong Police::HandleControl(LegoControlManagerNotificationParam& p_param)
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
break; break;
case PoliceScript::c_Door_Ctl: case PoliceScript::c_Door_Ctl:
if (m_policeState->GetUnknown0x0c() == 1) { if (m_policeState->GetPlayAnimation() == 1) {
DeleteObjects(&m_atomId, PoliceScript::c_nps001ni_RunAnim, PoliceScript::c_nps002la_RunAnim); DeleteObjects(&m_atomId, PoliceScript::c_nps001ni_RunAnim, PoliceScript::c_nps002la_RunAnim);
} }
@@ -132,7 +132,7 @@ MxLong Police::HandleControl(LegoControlManagerNotificationParam& p_param)
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
break; break;
case PoliceScript::c_Donut_Ctl: case PoliceScript::c_Donut_Ctl:
m_policeState->FUN_1005ea40(); m_policeState->StartAnimation();
} }
} }
@@ -145,8 +145,8 @@ MxLong Police::HandleEndAction(MxEndActionNotificationParam& p_param)
MxDSAction* action = p_param.GetAction(); MxDSAction* action = p_param.GetAction();
if (m_radio.Notify(p_param) == 0 && m_atomId == action->GetAtomId()) { if (m_radio.Notify(p_param) == 0 && m_atomId == action->GetAtomId()) {
if (m_policeState->GetUnknown0x0c() == 1) { if (m_policeState->GetPlayAnimation() == 1) {
m_policeState->SetUnknown0x0c(0); m_policeState->SetPlayAnimation(0);
return 1; return 1;
} }
@@ -161,9 +161,9 @@ MxLong Police::HandleKeyPress(LegoEventNotificationParam& p_param)
{ {
MxLong result = 0; MxLong result = 0;
if (p_param.GetKey() == VK_SPACE && m_policeState->GetUnknown0x0c() == 1) { if (p_param.GetKey() == VK_SPACE && m_policeState->GetPlayAnimation() == 1) {
DeleteObjects(&m_atomId, PoliceScript::c_nps001ni_RunAnim, PoliceScript::c_nps002la_RunAnim); DeleteObjects(&m_atomId, PoliceScript::c_nps001ni_RunAnim, PoliceScript::c_nps002la_RunAnim);
m_policeState->SetUnknown0x0c(0); m_policeState->SetPlayAnimation(0);
return 1; return 1;
} }
@@ -197,7 +197,7 @@ MxBool Police::Escape()
// FUNCTION: LEGO1 0x1005e7c0 // FUNCTION: LEGO1 0x1005e7c0
PoliceState::PoliceState() PoliceState::PoliceState()
{ {
m_unk0x0c = 0; m_playAnimation = 0;
m_policeScript = (rand() % 2 == 0) ? PoliceScript::c_nps002la_RunAnim : PoliceScript::c_nps001ni_RunAnim; m_policeScript = (rand() % 2 == 0) ? PoliceScript::c_nps002la_RunAnim : PoliceScript::c_nps001ni_RunAnim;
} }
@@ -218,11 +218,11 @@ MxResult PoliceState::Serialize(LegoStorage* p_storage)
} }
// FUNCTION: LEGO1 0x1005ea40 // FUNCTION: LEGO1 0x1005ea40
void PoliceState::FUN_1005ea40() void PoliceState::StartAnimation()
{ {
PoliceScript::Script policeScript; PoliceScript::Script policeScript;
if (m_unk0x0c == 1) { if (m_playAnimation == 1) {
return; return;
} }
@@ -248,5 +248,5 @@ void PoliceState::FUN_1005ea40()
Start(&action); Start(&action);
} }
m_unk0x0c = 1; m_playAnimation = 1;
} }