From c0ab916955054485be79797af11ce43ad7630a20 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sat, 3 Aug 2024 11:07:54 -0700 Subject: [PATCH] Implement/match TowTrack::ActivateSceneActions --- LEGO1/lego/legoomni/include/towtrack.h | 4 +- LEGO1/lego/legoomni/src/actors/towtrack.cpp | 54 +++++++++++++++++---- LEGO1/lego/legoomni/src/worlds/isle.cpp | 2 +- 3 files changed, 47 insertions(+), 13 deletions(-) diff --git a/LEGO1/lego/legoomni/include/towtrack.h b/LEGO1/lego/legoomni/include/towtrack.h index b9d4ab32..03911eda 100644 --- a/LEGO1/lego/legoomni/include/towtrack.h +++ b/LEGO1/lego/legoomni/include/towtrack.h @@ -96,7 +96,7 @@ class TowTrack : public IslePathActor { void CreateState(); void FUN_1004dab0(); - void FUN_1004dad0(); + void ActivateSceneActions(); void StopActions(); void FUN_1004dbe0(); @@ -105,7 +105,7 @@ class TowTrack : public IslePathActor { private: void Leave(); - void FUN_1004dcf0(IsleScript::Script); + void PlayAction(IsleScript::Script); undefined4 m_unk0x160; // 0x160 TowTrackMissionState* m_state; // 0x164 diff --git a/LEGO1/lego/legoomni/src/actors/towtrack.cpp b/LEGO1/lego/legoomni/src/actors/towtrack.cpp index 67321333..510ed621 100644 --- a/LEGO1/lego/legoomni/src/actors/towtrack.cpp +++ b/LEGO1/lego/legoomni/src/actors/towtrack.cpp @@ -2,6 +2,7 @@ #include "isle.h" #include "isle_actions.h" +#include "jukebox_actions.h" #include "legocontrolmanager.h" #include "legogamestate.h" #include "legonavcontroller.h" @@ -10,6 +11,7 @@ #include "legoworld.h" #include "misc.h" #include "mxmisc.h" +#include "mxsoundpresenter.h" #include "mxtimer.h" #include "mxtransitionmanager.h" #include "mxvariabletable.h" @@ -88,7 +90,7 @@ void TowTrack::VTable0x70(float p_time) VariableTable()->SetVariable(g_varTOWFUEL, buf); if (p_time - m_state->m_unk0x0c > 100000.0f && m_state->m_unk0x08 == 1 && !m_state->m_unk0x10) { - FUN_1004dcf0(IsleScript::c_Avo909In_PlayWav); + PlayAction(IsleScript::c_Avo909In_PlayWav); m_state->m_unk0x10 = TRUE; } } @@ -229,23 +231,55 @@ void TowTrack::Leave() ControlManager()->Unregister(this); } -// STUB: LEGO1 0x1004d9e0 +// FUNCTION: LEGO1 0x1004d9e0 MxLong TowTrack::HandleControl(LegoControlManagerNotificationParam& p_param) { - // TODO - return 0; + MxLong result = 0; + + if (p_param.GetUnknown0x28() == 1) { + switch (p_param.GetClickedObjectId()) { + case IsleScript::c_TowTrackArms_Ctl: + Exit(); + GameState()->m_currentArea = LegoGameState::e_unk66; + result = 1; + break; + case IsleScript::c_TowInfo_Ctl: + ((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::e_infomain); + TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE); + Exit(); + GameState()->m_currentArea = LegoGameState::e_unk66; + result = 1; + break; + case IsleScript::c_TowHorn_Ctl: + MxSoundPresenter* presenter = (MxSoundPresenter*) CurrentWorld()->Find("MxSoundPresenter", "TowHorn_Sound"); + presenter->Enable(p_param.GetUnknown0x28()); + break; + } + } + + return result; } -// STUB: LEGO1 0x1004dab0 +// FUNCTION: LEGO1 0x1004dab0 void TowTrack::FUN_1004dab0() { - // TODO + m_state->m_unk0x08 = 1; + HandleClick(); } -// STUB: LEGO1 0x1004dad0 -void TowTrack::FUN_1004dad0() +// FUNCTION: LEGO1 0x1004dad0 +void TowTrack::ActivateSceneActions() { - // TODO + PlayMusic(JukeboxScript::c_JBMusic2); + + if (m_state->m_unk0x08 != 0) { + if (m_state->m_unk0x08 == 2) { + PlayAction(IsleScript::c_wrt082na_PlayWav); + } + else { + PlayAction(IsleScript::c_wgs032nu_PlayWav); + } + } } // FUNCTION: LEGO1 0x1004db10 @@ -269,7 +303,7 @@ void TowTrack::FUN_1004dbe0() } // STUB: LEGO1 0x1004dcf0 -void TowTrack::FUN_1004dcf0(IsleScript::Script) +void TowTrack::PlayAction(IsleScript::Script) { // TODO } diff --git a/LEGO1/lego/legoomni/src/worlds/isle.cpp b/LEGO1/lego/legoomni/src/worlds/isle.cpp index 20c7d28a..cc759ea8 100644 --- a/LEGO1/lego/legoomni/src/worlds/isle.cpp +++ b/LEGO1/lego/legoomni/src/worlds/isle.cpp @@ -1036,7 +1036,7 @@ MxLong Isle::HandleTransitionEnd() FUN_10032d30(IsleScript::c_TowFuelMeter, JukeboxScript::c_MusicTheme1, NULL, TRUE); if (!m_act1state->m_unk0x01f) { - m_towtrack->FUN_1004dad0(); + m_towtrack->ActivateSceneActions(); } break; case LegoGameState::e_jetski: