TheCloud/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-09-22 11:31:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use enum for states in PoliceState (#1552)

Browse Source
This commit is contained in:
Fabian Neundorf 2025-06-11 01:07:10 +02:00 committed by GitHub
parent 180d4949da
commit 99ff92e49e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,11 @@ class MxDSAction;
// SIZE 0x10
class PoliceState : public LegoState {
public:
enum {
e_noAnimation = 0,
e_playingAnimation = 1,
};
PoliceState();
~PoliceState() override {}
@ -38,15 +43,15 @@ public:
// SYNTHETIC: LEGO1 0x1005e920
// PoliceState::`scalar deleting destructor'
MxS32 GetPlayAnimation() { return m_playAnimation; }
void SetPlayAnimation(MxS32 p_playAnimation) { m_playAnimation = p_playAnimation; }
MxS32 GetState() { return m_state; }
void SetState(MxS32 p_state) { m_state = p_state; }
void StartAnimation();
// TODO: Most likely getters/setters are not used according to BETA.
PoliceScript::Script m_policeScript; // 0x08
MxS32 m_playAnimation; // 0x0c
MxS32 m_state; // 0x0c
};
// VTABLE: LEGO1 0x100d8a80

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

@ -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->GetPlayAnimation() == 1) {
if (m_policeState->GetState() == PoliceState::e_playingAnimation) {
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->GetPlayAnimation() == 1) {
if (m_policeState->GetState() == PoliceState::e_playingAnimation) {
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->GetPlayAnimation() == 1) {
if (m_policeState->GetState() == PoliceState::e_playingAnimation) {
DeleteObjects(&m_atomId, PoliceScript::c_nps001ni_RunAnim, PoliceScript::c_nps002la_RunAnim);
}
@ -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->GetPlayAnimation() == 1) {
m_policeState->SetPlayAnimation(0);
if (m_policeState->GetState() == PoliceState::e_playingAnimation) {
m_policeState->SetState(PoliceState::e_noAnimation);
return 1;
}
@ -161,9 +161,9 @@ MxLong Police::HandleKeyPress(LegoEventNotificationParam& p_param)
{
MxLong result = 0;
if (p_param.GetKey() == VK_SPACE && m_policeState->GetPlayAnimation() == 1) {
if (p_param.GetKey() == VK_SPACE && m_policeState->GetState() == PoliceState::e_playingAnimation) {
DeleteObjects(&m_atomId, PoliceScript::c_nps001ni_RunAnim, PoliceScript::c_nps002la_RunAnim);
m_policeState->SetPlayAnimation(0);
m_policeState->SetState(PoliceState::e_noAnimation);
return 1;
}
@ -197,7 +197,7 @@ MxBool Police::Escape()
// FUNCTION: LEGO1 0x1005e7c0
PoliceState::PoliceState()
{
m_playAnimation = 0;
m_state = PoliceState::e_noAnimation;
m_policeScript = (rand() % 2 == 0) ? PoliceScript::c_nps002la_RunAnim : PoliceScript::c_nps001ni_RunAnim;
}
@ -222,7 +222,7 @@ void PoliceState::StartAnimation()
{
PoliceScript::Script policeScript;
if (m_playAnimation == 1) {
if (m_state == PoliceState::e_playingAnimation) {
return;
}
@ -248,5 +248,5 @@ void PoliceState::StartAnimation()
Start(&action);
}
m_playAnimation = 1;
m_state = PoliceState::e_playingAnimation;
}