mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-24 17:04:17 +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/actors/helicopter.cpp
View File

@@ -134,7 +134,7 @@ MxLong Helicopter::HandleClick()
((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::e_copter);
FUN_10015820(TRUE, 0);
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE);
SetState(LegoPathActor::c_disable);
SetActorFlags(LegoPathActor::c_disable);
PlayMusic(JukeboxScript::c_Jail_Music);
break;
case LegoGameState::e_act2:
@@ -199,7 +199,7 @@ MxLong Helicopter::HandleControl(LegoControlManagerNotificationParam& p_param)
m_state->m_unk0x08 = 1;
m_world->RemoveActor(this);
InvokeAction(Extra::ActionType::e_start, script, IsleScript::c_HelicopterTakeOff_Anim, NULL);
SetState(0);
SetActorFlags(0);
}
result = 1;
@@ -214,7 +214,7 @@ MxLong Helicopter::HandleControl(LegoControlManagerNotificationParam& p_param)
m_state->m_unk0x08 = 3;
m_world->RemoveActor(this);
InvokeAction(Extra::ActionType::e_start, script, IsleScript::c_HelicopterLand_Anim, NULL);
SetState(LegoPathActor::c_disable);
SetActorFlags(LegoPathActor::c_disable);
}
result = 1;
@@ -382,12 +382,12 @@ void Helicopter::VTable0x74(Matrix4& p_transform)
}
// FUNCTION: LEGO1 0x10003ee0
void Helicopter::VTable0x70(float p_time)
void Helicopter::UpdateState(float p_time)
{
MxU32 state = m_state->GetUnkown8();
switch (state) {
default:
LegoPathActor::VTable0x70(p_time);
LegoPathActor::UpdateState(p_time);
return;
case 4:
case 5:
@@ -419,7 +419,7 @@ void Helicopter::VTable0x70(float p_time)
else {
((Act3*) m_world)->FUN_10073430();
}
LegoPathActor::m_state = 4;
LegoPathActor::m_actorFlags = 4;
}
}
}