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

Refactor actor states, define enum (#1220)

Browse Source 
* Refactor actor states, define enum

* Revert

* Rename `UpdateState` to `Animate`
This commit is contained in:
Christian Semmler
2024-12-13 12:30:50 -07:00
committed by GitHub
parent ce3f71ea0f
commit 6da2faa48c
44 changed files with 161 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
LEGO1/lego/legoomni/src/worlds/act3.cpp
View File

@@ -426,7 +426,7 @@ MxLong Act3::Notify(MxParam& p_param)
VideoManager()->Get3DManager()->SetFrustrum(45.0f, 0.1f, 125.0f);
m_brickster->SetWorldSpeed(5.0f);
m_brickster->SetActorFlags(0);
m_brickster->SetActorState(LegoPathActor::c_initial);
assert(BackgroundAudioManager());
action.SetAtomId(*g_jukeboxScript);
@@ -435,11 +435,11 @@ MxLong Act3::Notify(MxParam& p_param)
BackgroundAudioManager()->PlayMusic(action, 5, MxPresenter::e_repeating);
m_brickster->FUN_100417c0();
m_cop1->SetActorFlags(0);
m_cop1->SetActorState(LegoPathActor::c_initial);
m_cop1->SetWorldSpeed(2.0f);
m_cop1->VTable0xa8();
m_cop2->SetActorFlags(0);
m_cop2->SetActorState(LegoPathActor::c_initial);
m_cop2->SetWorldSpeed(2.0f);
m_cop2->VTable0xa8();
@@ -592,9 +592,9 @@ void Act3::GoodEnding(const Matrix4& p_destination)
{
assert(m_cop1 && m_cop2 && m_brickster && m_state);
m_cop1->SetActorFlags(LegoPathActor::c_disable);
m_cop2->SetActorFlags(LegoPathActor::c_disable);
m_brickster->SetActorFlags(LegoPathActor::c_disable);
m_cop1->SetActorState(LegoPathActor::c_disabled);
m_cop2->SetActorState(LegoPathActor::c_disabled);
m_brickster->SetActorState(LegoPathActor::c_disabled);
m_unk0x4220.Clear();
m_copter->FUN_10004640(p_destination);