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

implement remaining functions/fixes

Browse Source
This commit is contained in:
Joshua Peisach 2024-02-25 13:14:12 -05:00
parent 8b5b77c8f8
commit c98d4997e2
No known key found for this signature in database
GPG Key ID: 41C3D4189AFEDB5A
2 changed files with 140 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,17 @@
// SIZE 0x104 // SIZE 0x104
class JukeBox : public LegoWorld { class JukeBox : public LegoWorld {
public: public:
// JUKEBOXW.SI
enum JukeBoxWorldScript {
c_volDownCtl = 1,
c_volUpCtl = 2,
c_dBackCtl = 3,
c_dFwdCtl = 4,
c_noteCtl = 5,
};
JukeBox(); JukeBox();
~JukeBox() override; // vtable+0x00
MxLong Notify(MxParam& p_param) override; // vtable+0x04 MxLong Notify(MxParam& p_param) override; // vtable+0x04
MxResult Tickle() override; // vtable+0x08 MxResult Tickle() override; // vtable+0x08
@ -38,6 +48,7 @@ class JukeBox : public LegoWorld {
// SYNTHETIC: LEGO1 0x1005d810 // SYNTHETIC: LEGO1 0x1005d810
// JukeBox::`scalar deleting destructor' // JukeBox::`scalar deleting destructor'
// JUKEBOX.SI (the actual audio)
enum JukeBoxScript { enum JukeBoxScript {
e_mamaPapaBrickolini, e_mamaPapaBrickolini,
e_jailUnused, e_jailUnused,

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

@ -1,5 +1,6 @@
#include "jukebox.h" #include "jukebox.h"
#include "act1state.h"
#include "jukeboxstate.h" #include "jukeboxstate.h"
#include "legocontrolmanager.h" #include "legocontrolmanager.h"
#include "legogamestate.h" #include "legogamestate.h"
@ -9,6 +10,7 @@
#include "mxomni.h" #include "mxomni.h"
#include "mxstillpresenter.h" #include "mxstillpresenter.h"
#include "mxticklemanager.h" #include "mxticklemanager.h"
#include "mxtransitionmanager.h"
#include "mxvideopresenter.h" #include "mxvideopresenter.h"
DECOMP_SIZE_ASSERT(JukeBox, 0x104) DECOMP_SIZE_ASSERT(JukeBox, 0x104)
@ -27,6 +29,18 @@ MxBool JukeBox::VTable0x5c()
return TRUE; return TRUE;
} }
// FUNCTION: LEGO1 0x1005d830
JukeBox::~JukeBox()
{
if (InputManager()->GetWorld() == this) {
InputManager()->ClearWorld();
}
ControlManager()->Unregister(this);
TickleManager()->UnregisterClient(this);
NotificationManager()->Unregister(this);
}
// FUNCTION: LEGO1 0x1005d8d0 // FUNCTION: LEGO1 0x1005d8d0
MxResult JukeBox::Create(MxDSAction& p_dsAction) MxResult JukeBox::Create(MxDSAction& p_dsAction)
{ {
@ -65,6 +79,7 @@ MxLong JukeBox::Notify(MxParam& p_param)
break; break;
case c_notificationTransitioned: case c_notificationTransitioned:
GameState()->SwitchArea(m_transitionDestination); GameState()->SwitchArea(m_transitionDestination);
result = 1;
break; break;
} }
} }
@ -108,8 +123,120 @@ void JukeBox::ReadyWorld()
// FUNCTION: LEGO1 0x1005da70 // FUNCTION: LEGO1 0x1005da70
MxBool JukeBox::HandleClick(LegoControlManagerEvent& p_param) MxBool JukeBox::HandleClick(LegoControlManagerEvent& p_param)
{ {
// TODO MxStillPresenter* bg;
return true; if (p_param.GetUnknown0x28() == 1) {
switch (p_param.GetClickedObjectId()) {
case c_dBackCtl:
switch (m_jukeBoxState->GetState()) {
case JukeBoxScript::e_mamaPapaBrickolini:
m_jukeBoxState->SetState(JukeBoxScript::e_residentialArea);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap");
bg->Enable(TRUE);
break;
case JukeBoxScript::e_jailUnused:
m_jukeBoxState->SetState(JukeBoxScript::e_mamaPapaBrickolini);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap");
bg->Enable(FALSE);
break;
case JukeBoxScript::e_act2Cave:
m_jukeBoxState->SetState(JukeBoxScript::e_jailUnused);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap");
bg->Enable(FALSE);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap");
bg->Enable(TRUE);
break;
case JukeBoxScript::e_bricksterChase:
m_jukeBoxState->SetState(JukeBoxScript::e_act2Cave);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap");
bg->Enable(FALSE);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap");
bg->Enable(TRUE);
break;
case JukeBoxScript::e_brickHunt:
m_jukeBoxState->SetState(JukeBoxScript::e_bricksterChase);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap");
bg->Enable(FALSE);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap");
bg->Enable(TRUE);
break;
case JukeBoxScript::e_residentialArea:
m_jukeBoxState->SetState(JukeBoxScript::e_brickHunt);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap");
bg->Enable(FALSE);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap");
bg->Enable(TRUE);
break;
}
return TRUE;
break;
case JukeBoxWorldScript::c_dFwdCtl:
switch (m_jukeBoxState->GetState()) {
case JukeBoxScript::e_mamaPapaBrickolini:
m_jukeBoxState->SetState(JukeBoxScript::e_jailUnused);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap");
bg->Enable(TRUE);
break;
case JukeBoxScript::e_jailUnused:
m_jukeBoxState->SetState(JukeBoxScript::e_act2Cave);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Right_Bitmap");
bg->Enable(FALSE);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap");
bg->Enable(TRUE);
break;
case JukeBoxScript::e_act2Cave:
m_jukeBoxState->SetState(JukeBoxScript::e_bricksterChase);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Decal_Bitmap");
bg->Enable(FALSE);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap");
bg->Enable(TRUE);
break;
case JukeBoxScript::e_bricksterChase:
m_jukeBoxState->SetState(JukeBoxScript::e_brickHunt);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Wallis_Bitmap");
bg->Enable(FALSE);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap");
bg->Enable(TRUE);
break;
case JukeBoxScript::e_brickHunt:
m_jukeBoxState->SetState(JukeBoxScript::e_residentialArea);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Nelson_Bitmap");
bg->Enable(FALSE);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap");
bg->Enable(TRUE);
break;
case JukeBoxScript::e_residentialArea:
m_jukeBoxState->SetState(JukeBoxScript::e_mamaPapaBrickolini);
bg = (MxStillPresenter*) Find("MxStillPresenter", "Torpedos_Bitmap");
bg->Enable(FALSE);
break;
}
break;
case JukeBoxWorldScript::c_noteCtl:
LegoGameState* gameState = GameState();
Act1State* act1State = (Act1State*) gameState->GetState("Act1State");
act1State->SetUnknown18(11);
m_transitionDestination = LegoGameState::Area::e_unk54;
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, 0, FALSE);
break;
}
}
return TRUE;
} }
// FUNCTION: LEGO1 0x1005dde0 // FUNCTION: LEGO1 0x1005dde0