From 180d4949da5862a6881b408e4bcaaa2a50cbae1b Mon Sep 17 00:00:00 2001 From: Fabian Neundorf Date: Tue, 10 Jun 2025 20:51:21 +0200 Subject: [PATCH] Clear unknowns in `PoliceState` (#1551) --- LEGO1/lego/legoomni/include/police.h | 8 ++++---- LEGO1/lego/legoomni/src/worlds/police.cpp | 24 +++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/LEGO1/lego/legoomni/include/police.h b/LEGO1/lego/legoomni/include/police.h index 39294cb1..ad56ccfa 100644 --- a/LEGO1/lego/legoomni/include/police.h +++ b/LEGO1/lego/legoomni/include/police.h @@ -38,15 +38,15 @@ public: // SYNTHETIC: LEGO1 0x1005e920 // PoliceState::`scalar deleting destructor' - undefined4 GetUnknown0x0c() { return m_unk0x0c; } - void SetUnknown0x0c(undefined4 p_unk0x0c) { m_unk0x0c = p_unk0x0c; } + MxS32 GetPlayAnimation() { return m_playAnimation; } + 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. PoliceScript::Script m_policeScript; // 0x08 - undefined4 m_unk0x0c; // 0x0c + MxS32 m_playAnimation; // 0x0c }; // VTABLE: LEGO1 0x100d8a80 diff --git a/LEGO1/lego/legoomni/src/worlds/police.cpp b/LEGO1/lego/legoomni/src/worlds/police.cpp index c1298bf3..08d567f0 100644 --- a/LEGO1/lego/legoomni/src/worlds/police.cpp +++ b/LEGO1/lego/legoomni/src/worlds/police.cpp @@ -105,7 +105,7 @@ MxLong Police::HandleControl(LegoControlManagerNotificationParam& p_param) switch (p_param.m_clickedObjectId) { case PoliceScript::c_LeftArrow_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); } @@ -114,7 +114,7 @@ MxLong Police::HandleControl(LegoControlManagerNotificationParam& p_param) TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE); break; 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); } @@ -123,7 +123,7 @@ MxLong Police::HandleControl(LegoControlManagerNotificationParam& p_param) TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE); break; 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); } @@ -132,7 +132,7 @@ MxLong Police::HandleControl(LegoControlManagerNotificationParam& p_param) TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE); break; 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(); if (m_radio.Notify(p_param) == 0 && m_atomId == action->GetAtomId()) { - if (m_policeState->GetUnknown0x0c() == 1) { - m_policeState->SetUnknown0x0c(0); + if (m_policeState->GetPlayAnimation() == 1) { + m_policeState->SetPlayAnimation(0); return 1; } @@ -161,9 +161,9 @@ MxLong Police::HandleKeyPress(LegoEventNotificationParam& p_param) { 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); - m_policeState->SetUnknown0x0c(0); + m_policeState->SetPlayAnimation(0); return 1; } @@ -197,7 +197,7 @@ MxBool Police::Escape() // FUNCTION: LEGO1 0x1005e7c0 PoliceState::PoliceState() { - m_unk0x0c = 0; + m_playAnimation = 0; 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 -void PoliceState::FUN_1005ea40() +void PoliceState::StartAnimation() { PoliceScript::Script policeScript; - if (m_unk0x0c == 1) { + if (m_playAnimation == 1) { return; } @@ -248,5 +248,5 @@ void PoliceState::FUN_1005ea40() Start(&action); } - m_unk0x0c = 1; + m_playAnimation = 1; }