mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-25 09:24: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

10
LEGO1/lego/legoomni/src/race/legoraceactor.cpp
View File

@@ -48,14 +48,14 @@ MxS32 LegoRaceActor::VTable0x68(Vector3& p_v1, Vector3& p_v2, Vector3& p_v3)
MxU32 LegoRaceActor::VTable0x90(float p_time, Matrix4& p_transform)
{
// Note: Code duplication with LegoExtraActor::VTable0x90
switch (m_state) {
switch (m_actorFlags) {
case 0:
case 1:
return 1;
case 2:
m_unk0x08 = p_time + 2000.0f;
m_state = 3;
m_actorFlags = 3;
m_actorTime += (p_time - m_lastTime) * m_worldSpeed;
m_lastTime = p_time;
return 0;
@@ -81,7 +81,7 @@ MxU32 LegoRaceActor::VTable0x90(float p_time, Matrix4& p_transform)
return 0;
}
else {
m_state = 0;
m_actorFlags = 0;
m_unk0x08 = 0;
positionRef -= g_unk0x10102b08;
@@ -98,7 +98,7 @@ MxU32 LegoRaceActor::VTable0x90(float p_time, Matrix4& p_transform)
MxResult LegoRaceActor::HitActor(LegoPathActor* p_actor, MxBool p_bool)
{
if (!p_actor->GetUserNavFlag()) {
if (p_actor->GetState()) {
if (p_actor->GetActorFlags()) {
return FAILURE;
}
@@ -112,7 +112,7 @@ MxResult LegoRaceActor::HitActor(LegoPathActor* p_actor, MxBool p_bool)
roi->FUN_100a58f0(matr);
p_actor->SetState(2);
p_actor->SetActorFlags(2);
}
}