isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-29 11:11:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes/matches

Browse Source
This commit is contained in:
Christian Semmler 2024-02-26 10:05:57 -05:00
parent c98d4997e2
commit cf49df1fc3
2 changed files with 105 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
LEGO1/lego/legoomni/include/jukebox.h
View File

@ -17,37 +17,9 @@ class JukeBox : public LegoWorld {
c_volUpCtl = 2, c_volUpCtl = 2,
c_dBackCtl = 3, c_dBackCtl = 3,
c_dFwdCtl = 4, c_dFwdCtl = 4,
c_noteCtl = 5, c_noteCtl = 5
}; };
JukeBox();
~JukeBox() override; // vtable+0x00
MxLong Notify(MxParam& p_param) override; // vtable+0x04
MxResult Tickle() override; // vtable+0x08
// FUNCTION: LEGO1 0x1005d6f0
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f02cc
return "JukeBox";
}
// FUNCTION: LEGO1 0x1005d700
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, JukeBox::ClassName()) || LegoWorld::IsA(p_name);
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void ReadyWorld() override; // vtable+0x50
MxBool VTable0x5c() override; // vtable+0x5c
MxBool VTable0x64() override; // vtable+0x64
void Enable(MxBool p_enable) override; // vtable+0x68
// SYNTHETIC: LEGO1 0x1005d810
// JukeBox::`scalar deleting destructor'
// JUKEBOX.SI (the actual audio) // JUKEBOX.SI (the actual audio)
enum JukeBoxScript { enum JukeBoxScript {
e_mamaPapaBrickolini, e_mamaPapaBrickolini,
@ -122,11 +94,39 @@ class JukeBox : public LegoWorld {
e_pizzaMission, e_pizzaMission,
}; };
JukeBox();
~JukeBox() override;
MxLong Notify(MxParam& p_param) override; // vtable+0x04
MxResult Tickle() override; // vtable+0x08
// FUNCTION: LEGO1 0x1005d6f0
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f02cc
return "JukeBox";
}
// FUNCTION: LEGO1 0x1005d700
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, JukeBox::ClassName()) || LegoWorld::IsA(p_name);
}
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
void ReadyWorld() override; // vtable+0x50
MxBool VTable0x5c() override; // vtable+0x5c
MxBool VTable0x64() override; // vtable+0x64
void Enable(MxBool p_enable) override; // vtable+0x68
// SYNTHETIC: LEGO1 0x1005d810
// JukeBox::`scalar deleting destructor'
private: private:
MxBool HandleClick(LegoControlManagerEvent&); MxBool HandleClick(LegoControlManagerEvent& p_param);
LegoGameState::Area m_transitionDestination; // 0xf8 LegoGameState::Area m_transitionDestination; // 0xf8
JukeBoxState* m_jukeBoxState; // 0xfc JukeBoxState* m_state; // 0xfc
undefined2 m_unk0x100; // 0x100 undefined2 m_unk0x100; // 0x100
}; };

168
LEGO1/lego/legoomni/src/isle/jukebox.cpp
View File

@ -19,7 +19,7 @@ DECOMP_SIZE_ASSERT(JukeBox, 0x104)
JukeBox::JukeBox() JukeBox::JukeBox()
{ {
m_unk0x100 = 0; m_unk0x100 = 0;
m_jukeBoxState = NULL; m_state = NULL;
NotificationManager()->Register(this); NotificationManager()->Register(this);
} }
@ -52,14 +52,12 @@ MxResult JukeBox::Create(MxDSAction& p_dsAction)
InputManager()->SetCamera(NULL); InputManager()->SetCamera(NULL);
LegoGameState* gameState = GameState(); m_state = (JukeBoxState*) GameState()->GetState("JukeBoxState");
JukeBoxState* jukeBoxState = (JukeBoxState*) gameState->GetState("JukeBoxState"); if (!m_state) {
if (!jukeBoxState) { m_state = (JukeBoxState*) GameState()->CreateState("JukeBoxState");
jukeBoxState = (JukeBoxState*) gameState->CreateState("JukeBoxState"); m_state->SetState(0);
jukeBoxState->SetState(0);
} }
m_jukeBoxState = jukeBoxState;
GameState()->SetCurrentArea(LegoGameState::e_jukeboxw); GameState()->SetCurrentArea(LegoGameState::e_jukeboxw);
GameState()->StopArea(LegoGameState::e_previousArea); GameState()->StopArea(LegoGameState::e_previousArea);
TickleManager()->RegisterClient(this, 2000); TickleManager()->RegisterClient(this, 2000);
@ -90,140 +88,121 @@ MxLong JukeBox::Notify(MxParam& p_param)
// FUNCTION: LEGO1 0x1005d9f0 // FUNCTION: LEGO1 0x1005d9f0
void JukeBox::ReadyWorld() void JukeBox::ReadyWorld()
{ {
MxStillPresenter* bg; MxStillPresenter* presenter = NULL;
char* objectName;
switch (m_jukeBoxState->GetState()) { switch (m_state->GetState()) {
case 1: case 1:
objectName = "Right_Bitmap"; presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap");
break; break;
case 2: case 2:
objectName = "Decal_Bitmap"; presenter = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap");
break; break;
case 3: case 3:
objectName = "Wallis_Bitmap"; presenter = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap");
break; break;
case 4: case 4:
objectName = "Nelson_Bitmap"; presenter = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap");
break; break;
case 5: case 5:
objectName = "Torpedos_Bitmap"; presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap");
break; break;
default:
goto done;
} }
bg = (MxStillPresenter*) Find("MxStillPresenter", objectName);
done: if (presenter) {
if (bg) { presenter->Enable(TRUE);
bg->Enable(TRUE);
} }
m_unk0x100 = 1; m_unk0x100 = 1;
} }
// FUNCTION: LEGO1 0x1005da70 // FUNCTION: LEGO1 0x1005da70
MxBool JukeBox::HandleClick(LegoControlManagerEvent& p_param) MxBool JukeBox::HandleClick(LegoControlManagerEvent& p_param)
{ {
MxStillPresenter* bg; MxStillPresenter* presenter;
if (p_param.GetUnknown0x28() == 1) { if (p_param.GetUnknown0x28() == 1) {
switch (p_param.GetClickedObjectId()) { switch (p_param.GetClickedObjectId()) {
case c_dBackCtl: case c_dBackCtl:
switch (m_jukeBoxState->GetState()) { switch (m_state->GetState()) {
case JukeBoxScript::e_mamaPapaBrickolini: case JukeBoxScript::e_mamaPapaBrickolini:
m_jukeBoxState->SetState(JukeBoxScript::e_residentialArea); m_state->SetState(JukeBoxScript::e_residentialArea);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap");
bg->Enable(TRUE); presenter->Enable(TRUE);
break; break;
case JukeBoxScript::e_jailUnused: case JukeBoxScript::e_jailUnused:
m_jukeBoxState->SetState(JukeBoxScript::e_mamaPapaBrickolini); m_state->SetState(JukeBoxScript::e_mamaPapaBrickolini);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap");
bg->Enable(FALSE); presenter->Enable(FALSE);
break; break;
case JukeBoxScript::e_act2Cave: case JukeBoxScript::e_act2Cave:
m_jukeBoxState->SetState(JukeBoxScript::e_jailUnused); m_state->SetState(JukeBoxScript::e_jailUnused);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap");
bg = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap"); presenter->Enable(FALSE);
bg->Enable(FALSE); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap");
presenter->Enable(TRUE);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap");
bg->Enable(TRUE);
break; break;
case JukeBoxScript::e_bricksterChase: case JukeBoxScript::e_bricksterChase:
m_jukeBoxState->SetState(JukeBoxScript::e_act2Cave); m_state->SetState(JukeBoxScript::e_act2Cave);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap");
bg = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap"); presenter->Enable(FALSE);
bg->Enable(FALSE); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap");
presenter->Enable(TRUE);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap");
bg->Enable(TRUE);
break; break;
case JukeBoxScript::e_brickHunt: case JukeBoxScript::e_brickHunt:
m_jukeBoxState->SetState(JukeBoxScript::e_bricksterChase); m_state->SetState(JukeBoxScript::e_bricksterChase);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap");
bg = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap"); presenter->Enable(FALSE);
bg->Enable(FALSE); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap");
presenter->Enable(TRUE);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap");
bg->Enable(TRUE);
break; break;
case JukeBoxScript::e_residentialArea: case JukeBoxScript::e_residentialArea:
m_jukeBoxState->SetState(JukeBoxScript::e_brickHunt); m_state->SetState(JukeBoxScript::e_brickHunt);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap");
bg = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap"); presenter->Enable(FALSE);
bg->Enable(FALSE); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap");
presenter->Enable(TRUE);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap");
bg->Enable(TRUE);
break; break;
} }
return TRUE;
break; break;
case JukeBoxWorldScript::c_dFwdCtl: case JukeBoxWorldScript::c_dFwdCtl:
switch (m_jukeBoxState->GetState()) { switch (m_state->GetState()) {
case JukeBoxScript::e_mamaPapaBrickolini: case JukeBoxScript::e_mamaPapaBrickolini:
m_jukeBoxState->SetState(JukeBoxScript::e_jailUnused); m_state->SetState(JukeBoxScript::e_jailUnused);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap");
bg->Enable(TRUE); presenter->Enable(TRUE);
break; break;
case JukeBoxScript::e_jailUnused: case JukeBoxScript::e_jailUnused:
m_jukeBoxState->SetState(JukeBoxScript::e_act2Cave); m_state->SetState(JukeBoxScript::e_act2Cave);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap");
bg = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap"); presenter->Enable(FALSE);
bg->Enable(FALSE); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap");
presenter->Enable(TRUE);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap");
bg->Enable(TRUE);
break; break;
case JukeBoxScript::e_act2Cave: case JukeBoxScript::e_act2Cave:
m_jukeBoxState->SetState(JukeBoxScript::e_bricksterChase); m_state->SetState(JukeBoxScript::e_bricksterChase);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap");
bg = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap"); presenter->Enable(FALSE);
bg->Enable(FALSE); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap");
presenter->Enable(TRUE);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap");
bg->Enable(TRUE);
break; break;
case JukeBoxScript::e_bricksterChase: case JukeBoxScript::e_bricksterChase:
m_jukeBoxState->SetState(JukeBoxScript::e_brickHunt); m_state->SetState(JukeBoxScript::e_brickHunt);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap");
bg = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap"); presenter->Enable(FALSE);
bg->Enable(FALSE); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap");
presenter->Enable(TRUE);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap");
bg->Enable(TRUE);
break; break;
case JukeBoxScript::e_brickHunt: case JukeBoxScript::e_brickHunt:
m_jukeBoxState->SetState(JukeBoxScript::e_residentialArea); m_state->SetState(JukeBoxScript::e_residentialArea);
presenter = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap");
bg = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap"); presenter->Enable(FALSE);
bg->Enable(FALSE); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap");
presenter->Enable(TRUE);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap");
bg->Enable(TRUE);
break; break;
case JukeBoxScript::e_residentialArea: case JukeBoxScript::e_residentialArea:
m_jukeBoxState->SetState(JukeBoxScript::e_mamaPapaBrickolini); m_state->SetState(JukeBoxScript::e_mamaPapaBrickolini);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap"); presenter = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap");
bg->Enable(FALSE); presenter->Enable(FALSE);
break; break;
} }
break; break;
@ -236,6 +215,7 @@ MxBool JukeBox::HandleClick(LegoControlManagerEvent& p_param)
break; break;
} }
} }
return TRUE; return TRUE;
} }
@ -265,7 +245,7 @@ MxResult JukeBox::Tickle()
if (m_unk0x100 == 1) { if (m_unk0x100 == 1) {
m_unk0x100 = 0; m_unk0x100 = 0;
FUN_10015820(FALSE, 7); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }
return SUCCESS; return SUCCESS;