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

Rename LegoPathActor::VTable0x70 to UpdateState (#1219)

Browse Source
This commit is contained in:
Christian Semmler
2024-12-13 11:20:03 -07:00
committed by GitHub
parent 263d7d1e4f
commit ce3f71ea0f
44 changed files with 132 additions and 132 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->SetState(0);
m_brickster->SetActorFlags(0);
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->SetState(0);
m_cop1->SetActorFlags(0);
m_cop1->SetWorldSpeed(2.0f);
m_cop1->VTable0xa8();
m_cop2->SetState(0);
m_cop2->SetActorFlags(0);
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->SetState(LegoPathActor::c_disable);
m_cop2->SetState(LegoPathActor::c_disable);
m_brickster->SetState(LegoPathActor::c_disable);
m_cop1->SetActorFlags(LegoPathActor::c_disable);
m_cop2->SetActorFlags(LegoPathActor::c_disable);
m_brickster->SetActorFlags(LegoPathActor::c_disable);
m_unk0x4220.Clear();
m_copter->FUN_10004640(p_destination);

2
LEGO1/lego/legoomni/src/worlds/isle.cpp
View File

@@ -586,7 +586,7 @@ void Isle::Enable(MxBool p_enable)
FALSE,
IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3
);
actor->SetState(0);
actor->SetActorFlags(0);
}
else {
FUN_10032620();

16
LEGO1/lego/legoomni/src/worlds/legoact2.cpp
View File

@@ -177,7 +177,7 @@ MxResult LegoAct2::Tickle()
m_unk0x10c4 = 1;
break;
case 1:
((LegoPathActor*) m_pepper->GetEntity())->SetState(LegoPathActor::c_disable);
((LegoPathActor*) m_pepper->GetEntity())->SetActorFlags(LegoPathActor::c_disable);
switch (rand() % 3) {
case 0:
@@ -336,7 +336,7 @@ MxLong LegoAct2::Notify(MxParam& p_param)
m_unk0x10c4 = 14;
m_unk0x10d0 = 0;
((LegoPathActor*) m_pepper->GetEntity())->SetState(LegoPathActor::c_disable);
((LegoPathActor*) m_pepper->GetEntity())->SetActorFlags(LegoPathActor::c_disable);
}
break;
case c_notificationTransitioned:
@@ -417,7 +417,7 @@ MxLong LegoAct2::HandleEndAction(MxEndActionNotificationParam& p_param)
m_unk0x10d0 = 0;
FUN_10052560(Act2mainScript::c_tra045la_RunAnim, TRUE, TRUE, NULL, NULL, NULL);
((LegoPathActor*) m_pepper->GetEntity())->SetState(LegoPathActor::c_disable);
((LegoPathActor*) m_pepper->GetEntity())->SetActorFlags(LegoPathActor::c_disable);
AnimationManager()->EnableCamAnims(TRUE);
AnimationManager()->FUN_1005f6d0(TRUE);
AnimationManager()->FUN_100604f0(g_unk0x100f4428, sizeOfArray(g_unk0x100f4428));
@@ -450,7 +450,7 @@ MxLong LegoAct2::HandleEndAction(MxEndActionNotificationParam& p_param)
m_unk0x10c4 = 13;
SpawnBricks();
PlayMusic(JukeboxScript::c_BrickHunt);
((LegoPathActor*) m_pepper->GetEntity())->SetState(0);
((LegoPathActor*) m_pepper->GetEntity())->SetActorFlags(0);
break;
}
case 14:
@@ -602,7 +602,7 @@ MxLong LegoAct2::HandlePathStruct(LegoPathStructNotificationParam& p_param)
{
if (m_unk0x10c4 == 5 && p_param.GetData() == 0x32) {
LegoPathActor* actor = (LegoPathActor*) m_pepper->GetEntity();
actor->SetState(LegoPathActor::c_disable);
actor->SetActorFlags(LegoPathActor::c_disable);
actor->SetWorldSpeed(0.0f);
FUN_10051900();
@@ -630,7 +630,7 @@ MxLong LegoAct2::HandlePathStruct(LegoPathStructNotificationParam& p_param)
FUN_10051fa0(p_param.GetData());
}
else if (m_unk0x10c4 == 10 && p_param.GetData() == 0x165) {
((LegoPathActor*) m_pepper->GetEntity())->SetState(LegoPathActor::c_disable);
((LegoPathActor*) m_pepper->GetEntity())->SetActorFlags(LegoPathActor::c_disable);
if (FUN_10052560(Act2mainScript::c_VOhide_PlayWav, FALSE, TRUE, NULL, NULL, NULL) == SUCCESS) {
m_unk0x1140 = Act2mainScript::c_VOhide_PlayWav;
@@ -746,7 +746,7 @@ void LegoAct2::FUN_10051960()
roi->SetVisibility(FALSE);
}
((LegoPathActor*) m_pepper->GetEntity())->SetState(0);
((LegoPathActor*) m_pepper->GetEntity())->SetActorFlags(0);
}
// FUNCTION: LEGO1 0x100519c0
@@ -937,7 +937,7 @@ MxResult LegoAct2::BadEnding()
}
LegoPathActor* actor = m_unk0x1138;
actor->SetState(LegoPathActor::c_disable);
actor->SetActorFlags(LegoPathActor::c_disable);
m_gameState->SetUnknown0x08(104);
m_destLocation = LegoGameState::e_infomain;