Implement/match several functions in Act3, refactor (#1197)

* Implement/match several functions in Act3, refactor

* Fix naming

* Rename

* Add comment

* Add annotation

* Add BETA assert
This commit is contained in:
Christian Semmler
2024-12-08 10:00:57 -07:00
committed by GitHub
parent 97fb6e4f15
commit 1aff40dd94
37 changed files with 244 additions and 112 deletions

View File

@@ -25,7 +25,7 @@ void LegoJetski::FUN_100136f0(float p_worldSpeed)
}
// STUB: LEGO1 0x10013740
void LegoJetski::VTable0x70(float p_float)
void LegoJetski::VTable0x70(float p_time)
{
// TODO
}

View File

@@ -119,14 +119,14 @@ MxS32 LegoJetskiRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_
}
// FUNCTION: LEGO1 0x10081550
void LegoJetskiRaceActor::VTable0x70(float p_float)
void LegoJetskiRaceActor::VTable0x70(float p_time)
{
if (m_unk0x0c == 0) {
const LegoChar* raceState = VariableTable()->GetVariable(g_raceState);
if (!stricmp(raceState, g_racing)) {
m_unk0x0c = 1;
m_lastTime = p_float - 1.0f;
m_unk0x1c = p_float;
m_lastTime = p_time - 1.0f;
m_unk0x1c = p_time;
}
else if (!m_userNavFlag) {
LegoAnimActor::VTable0x70(m_lastTime + 1.0f);
@@ -134,7 +134,7 @@ void LegoJetskiRaceActor::VTable0x70(float p_float)
}
if (m_unk0x0c == 1) {
LegoAnimActor::VTable0x70(p_float);
LegoAnimActor::VTable0x70(p_time);
}
}

View File

@@ -142,6 +142,7 @@ void LegoNavController::SetControlMax(int p_hMax, int p_vMax)
}
// FUNCTION: LEGO1 0x10054cd0
// FUNCTION: BETA10 0x1009ad76
void LegoNavController::SetToDefaultParams()
{
m_deadZone = g_defdeadZone;

View File

@@ -106,7 +106,7 @@ MxResult LegoPointOfViewController::Create(Lego3DView* p_lego3DView)
m_lego3DView = p_lego3DView;
m_nav = new LegoNavController();
LegoOmni::GetInstance()->SetNavController(m_nav);
m_nav->SetTrackDefaultParams(TRUE);
m_nav->SetTrackDefault(TRUE);
TickleManager()->RegisterClient(this, 10);
return SUCCESS;
}