mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-22 16:04:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement/match TowTrack::ActivateSceneActions (#1075)

Browse Source 
* Implement/match TowTrack::ActivateSceneActions

* Add PlayAction
This commit is contained in:
Christian Semmler
2024-08-03 11:17:17 -07:00
committed by GitHub
parent a1c6196bbc
commit 63586f88b2
3 changed files with 67 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
LEGO1/lego/legoomni/include/towtrack.h
View File

@@ -96,7 +96,7 @@ public:
void CreateState(); void CreateState();
void FUN_1004dab0(); void FUN_1004dab0();
void FUN_1004dad0(); void ActivateSceneActions();
void StopActions(); void StopActions();
void FUN_1004dbe0(); void FUN_1004dbe0();
@@ -105,18 +105,18 @@ public:
private: private:
void Leave(); void Leave();
void FUN_1004dcf0(IsleScript::Script); void PlayAction(IsleScript::Script p_objectId);
undefined4 m_unk0x160; // 0x160 undefined4 m_unk0x160; // 0x160
TowTrackMissionState* m_state; // 0x164 TowTrackMissionState* m_state; // 0x164
MxS16 m_unk0x168; // 0x168 MxS16 m_unk0x168; // 0x168
MxS16 m_actorId; // 0x16a MxS16 m_actorId; // 0x16a
MxS16 m_unk0x16c; // 0x16c MxS16 m_unk0x16c; // 0x16c
MxS16 m_unk0x16e; // 0x16e MxS16 m_unk0x16e; // 0x16e
MxS32 m_unk0x170; // 0x170 IsleScript::Script m_lastAction; // 0x170
MxS32 m_unk0x174; // 0x174 MxS32 m_unk0x174; // 0x174
MxFloat m_fuel; // 0x178 MxFloat m_fuel; // 0x178
MxFloat m_time; // 0x17c MxFloat m_time; // 0x17c
}; };
#endif // TOWTRACK_H #endif // TOWTRACK_H

68
LEGO1/lego/legoomni/src/actors/towtrack.cpp
View File

@@ -2,6 +2,7 @@
#include "isle.h" #include "isle.h"
#include "isle_actions.h" #include "isle_actions.h"
#include "jukebox_actions.h"
#include "legocontrolmanager.h" #include "legocontrolmanager.h"
#include "legogamestate.h" #include "legogamestate.h"
#include "legonavcontroller.h" #include "legonavcontroller.h"
@@ -9,7 +10,9 @@
#include "legovariables.h" #include "legovariables.h"
#include "legoworld.h" #include "legoworld.h"
#include "misc.h" #include "misc.h"
#include "mxbackgroundaudiomanager.h"
#include "mxmisc.h" #include "mxmisc.h"
#include "mxsoundpresenter.h"
#include "mxtimer.h" #include "mxtimer.h"
#include "mxtransitionmanager.h" #include "mxtransitionmanager.h"
#include "mxvariabletable.h" #include "mxvariabletable.h"
@@ -24,7 +27,7 @@ TowTrack::TowTrack()
m_actorId = -1; m_actorId = -1;
m_state = NULL; m_state = NULL;
m_unk0x16c = 0; m_unk0x16c = 0;
m_unk0x170 = -1; m_lastAction = IsleScript::c_noneIsle;
m_unk0x16e = 0; m_unk0x16e = 0;
m_unk0x174 = -1; m_unk0x174 = -1;
m_maxLinearVel = 40.0; m_maxLinearVel = 40.0;
@@ -88,7 +91,7 @@ void TowTrack::VTable0x70(float p_time)
VariableTable()->SetVariable(g_varTOWFUEL, buf); VariableTable()->SetVariable(g_varTOWFUEL, buf);
if (p_time - m_state->m_unk0x0c > 100000.0f && m_state->m_unk0x08 == 1 && !m_state->m_unk0x10) { 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; m_state->m_unk0x10 = TRUE;
} }
} }
@@ -188,7 +191,7 @@ MxLong TowTrack::HandleClick()
} }
else { else {
SpawnPlayer(LegoGameState::e_unk28, TRUE, 0); SpawnPlayer(LegoGameState::e_unk28, TRUE, 0);
m_unk0x170 = -1; m_lastAction = IsleScript::c_noneIsle;
m_unk0x174 = -1; m_unk0x174 = -1;
m_state->m_unk0x0c = Timer()->GetTime(); m_state->m_unk0x0c = Timer()->GetTime();
m_state->m_unk0x10 = FALSE; m_state->m_unk0x10 = FALSE;
@@ -229,23 +232,55 @@ void TowTrack::Leave()
ControlManager()->Unregister(this); ControlManager()->Unregister(this);
} }
// STUB: LEGO1 0x1004d9e0 // FUNCTION: LEGO1 0x1004d9e0
MxLong TowTrack::HandleControl(LegoControlManagerNotificationParam& p_param) MxLong TowTrack::HandleControl(LegoControlManagerNotificationParam& p_param)
{ {
// TODO MxLong result = 0;
return 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() void TowTrack::FUN_1004dab0()
{ {
// TODO m_state->m_unk0x08 = 1;
HandleClick();
} }
// STUB: LEGO1 0x1004dad0 // FUNCTION: LEGO1 0x1004dad0
void TowTrack::FUN_1004dad0() 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 // FUNCTION: LEGO1 0x1004db10
@@ -268,10 +303,15 @@ void TowTrack::FUN_1004dbe0()
// TODO // TODO
} }
// STUB: LEGO1 0x1004dcf0 // FUNCTION: LEGO1 0x1004dcf0
void TowTrack::FUN_1004dcf0(IsleScript::Script) void TowTrack::PlayAction(IsleScript::Script p_objectId)
{ {
// TODO if (p_objectId != -1) {
InvokeAction(Extra::e_start, *g_isleScript, p_objectId, NULL);
}
m_lastAction = p_objectId;
BackgroundAudioManager()->LowerVolume();
} }
// FUNCTION: LEGO1 0x1004dd30 // FUNCTION: LEGO1 0x1004dd30

2
LEGO1/lego/legoomni/src/worlds/isle.cpp
View File

@@ -1036,7 +1036,7 @@ MxLong Isle::HandleTransitionEnd()
FUN_10032d30(IsleScript::c_TowFuelMeter, JukeboxScript::c_MusicTheme1, NULL, TRUE); FUN_10032d30(IsleScript::c_TowFuelMeter, JukeboxScript::c_MusicTheme1, NULL, TRUE);
if (!m_act1state->m_unk0x01f) { if (!m_act1state->m_unk0x01f) {
m_towtrack->FUN_1004dad0(); m_towtrack->ActivateSceneActions();
} }
break; break;
case LegoGameState::e_jetski: case LegoGameState::e_jetski: