From 923b4500084dafa448bf175514bfdbdb04568b19 Mon Sep 17 00:00:00 2001 From: Sebastian Mischke Date: Thu, 8 Jan 2026 00:31:28 +0100 Subject: [PATCH] Clear unknowns in `TowTrack` (#1709) * Rename FUN_1004dcb0 to PlayActorAnimation * Rename m_unk0x160 to m_unused_0x160 * Rename m_unk0x168 to m_unused_0x168 * Fix variable naming pattern --- LEGO1/lego/legoomni/include/towtrack.h | 6 ++-- LEGO1/lego/legoomni/src/actors/towtrack.cpp | 34 ++++++++++----------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/LEGO1/lego/legoomni/include/towtrack.h b/LEGO1/lego/legoomni/include/towtrack.h index e9e41418..04a9b4a4 100644 --- a/LEGO1/lego/legoomni/include/towtrack.h +++ b/LEGO1/lego/legoomni/include/towtrack.h @@ -192,12 +192,12 @@ class TowTrack : public IslePathActor { private: void Leave(); void PlayFinalAnimation(IsleScript::Script p_objectId); - void FUN_1004dcb0(IsleScript::Script p_objectId); + void PlayActorAnimation(IsleScript::Script p_objectId); void PlayAction(IsleScript::Script p_objectId); - undefined4 m_unk0x160; // 0x160 + undefined4 m_unused0x160; // 0x160 TowTrackMissionState* m_state; // 0x164 - MxS16 m_unk0x168; // 0x168 + MxS16 m_unused0x168; // 0x168 MxS16 m_actorId; // 0x16a MxS16 m_treeBlockageTriggered; // 0x16c MxS16 m_speedComplaintTriggered; // 0x16e diff --git a/LEGO1/lego/legoomni/src/actors/towtrack.cpp b/LEGO1/lego/legoomni/src/actors/towtrack.cpp index c0531bb8..1b94d2f3 100644 --- a/LEGO1/lego/legoomni/src/actors/towtrack.cpp +++ b/LEGO1/lego/legoomni/src/actors/towtrack.cpp @@ -29,7 +29,7 @@ extern MxU32 g_isleFlags; // FUNCTION: LEGO1 0x1004c720 TowTrack::TowTrack() { - m_unk0x168 = 0; + m_unused0x168 = 0; m_actorId = -1; m_state = NULL; m_treeBlockageTriggered = 0; @@ -200,19 +200,19 @@ MxLong TowTrack::HandleEndAction(MxEndActionNotificationParam& p_param) switch (m_actorId) { case c_pepper: - FUN_1004dcb0(IsleScript::c_wgs085nu_RunAnim); + PlayActorAnimation(IsleScript::c_wgs085nu_RunAnim); break; case c_mama: - FUN_1004dcb0(IsleScript::c_wgs086nu_RunAnim); + PlayActorAnimation(IsleScript::c_wgs086nu_RunAnim); break; case c_papa: - FUN_1004dcb0(IsleScript::c_wgs088nu_RunAnim); + PlayActorAnimation(IsleScript::c_wgs088nu_RunAnim); break; case c_nick: - FUN_1004dcb0(IsleScript::c_wgs087nu_RunAnim); + PlayActorAnimation(IsleScript::c_wgs087nu_RunAnim); break; case c_laura: - FUN_1004dcb0(IsleScript::c_wgs089nu_RunAnim); + PlayActorAnimation(IsleScript::c_wgs089nu_RunAnim); break; } @@ -229,19 +229,19 @@ MxLong TowTrack::HandleEndAction(MxEndActionNotificationParam& p_param) switch (m_actorId) { case c_pepper: - FUN_1004dcb0(IsleScript::c_wgs091nu_RunAnim); + PlayActorAnimation(IsleScript::c_wgs091nu_RunAnim); break; case c_mama: - FUN_1004dcb0(IsleScript::c_wgs092nu_RunAnim); + PlayActorAnimation(IsleScript::c_wgs092nu_RunAnim); break; case c_papa: - FUN_1004dcb0(IsleScript::c_wgs094nu_RunAnim); + PlayActorAnimation(IsleScript::c_wgs094nu_RunAnim); break; case c_nick: - FUN_1004dcb0(IsleScript::c_wgs093nu_RunAnim); + PlayActorAnimation(IsleScript::c_wgs093nu_RunAnim); break; case c_laura: - FUN_1004dcb0(IsleScript::c_wgs095nu_RunAnim); + PlayActorAnimation(IsleScript::c_wgs095nu_RunAnim); break; } @@ -254,19 +254,19 @@ MxLong TowTrack::HandleEndAction(MxEndActionNotificationParam& p_param) switch (m_actorId) { case c_pepper: - FUN_1004dcb0(IsleScript::c_wgs098nu_RunAnim); + PlayActorAnimation(IsleScript::c_wgs098nu_RunAnim); break; case c_mama: - FUN_1004dcb0(IsleScript::c_wgs099nu_RunAnim); + PlayActorAnimation(IsleScript::c_wgs099nu_RunAnim); break; case c_papa: - FUN_1004dcb0(IsleScript::c_wgs101nu_RunAnim); + PlayActorAnimation(IsleScript::c_wgs101nu_RunAnim); break; case c_nick: - FUN_1004dcb0(IsleScript::c_wgs100nu_RunAnim); + PlayActorAnimation(IsleScript::c_wgs100nu_RunAnim); break; case c_laura: - FUN_1004dcb0(IsleScript::c_wgs102nu_RunAnim); + PlayActorAnimation(IsleScript::c_wgs102nu_RunAnim); break; } @@ -572,7 +572,7 @@ void TowTrack::PlayFinalAnimation(IsleScript::Script p_objectId) } // FUNCTION: LEGO1 0x1004dcb0 -void TowTrack::FUN_1004dcb0(IsleScript::Script p_objectId) +void TowTrack::PlayActorAnimation(IsleScript::Script p_objectId) { AnimationManager()->FUN_1005f6d0(TRUE); AnimationManager()