isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-28 18:51:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Rename remaining playlists

Browse Source
This commit is contained in:
Christian Semmler 2024-02-10 11:43:38 -05:00
parent 0fdc856193
commit 2eeb995534
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
LEGO1/lego/legoomni/include/infocenterstate.h
View File

@ -2,6 +2,7 @@
#define INFOCENTERSTATE_H #define INFOCENTERSTATE_H
#include "decomp.h" #include "decomp.h"
#include "legogamestate.h"
#include "legostate.h" #include "legostate.h"
#include "mxstillpresenter.h" #include "mxstillpresenter.h"
@ -32,10 +33,10 @@ class InfocenterState : public LegoState {
inline MxStillPresenter* GetInfocenterBufferElement(MxS32 p_index) { return m_buffer[p_index]; } inline MxStillPresenter* GetInfocenterBufferElement(MxS32 p_index) { return m_buffer[p_index]; }
inline Playlist& GetExitDialogueAct1() { return m_exitDialogueAct1; } inline Playlist& GetExitDialogueAct1() { return m_exitDialogueAct1; }
inline Playlist& GetExitDialogueAct23() { return m_exitDialogueAct23; } inline Playlist& GetExitDialogueAct23() { return m_exitDialogueAct23; }
inline Playlist& GetUnknown0x68() { return m_unk0x68; } inline Playlist& GetReturnDialogue(LegoGameState::Act p_act) { return m_returnDialogue[p_act]; }
inline Playlist& GetLeaveDialogue(LegoGameState::Act p_act) { return m_leaveDialogue[p_act]; }
inline Playlist& GetBricksterDialogue() { return m_bricksterDialogue; }
inline MxU32 GetUnknown0x74() { return m_unk0x74; } inline MxU32 GetUnknown0x74() { return m_unk0x74; }
inline Playlist* GetReturnDialogue() { return m_returnDialogue; }
inline Playlist* GetLeaveDialogue() { return m_leaveDialogue; }
inline void SetUnknown0x74(MxU32 p_unk0x74) { m_unk0x74 = p_unk0x74; } inline void SetUnknown0x74(MxU32 p_unk0x74) { m_unk0x74 = p_unk0x74; }
@ -47,7 +48,7 @@ class InfocenterState : public LegoState {
Playlist m_exitDialogueAct23; // 0x14 Playlist m_exitDialogueAct23; // 0x14
Playlist m_returnDialogue[3]; // 0x20 Playlist m_returnDialogue[3]; // 0x20
Playlist m_leaveDialogue[3]; // 0x44 Playlist m_leaveDialogue[3]; // 0x44
Playlist m_unk0x68; // 0x68 Playlist m_bricksterDialogue; // 0x68
MxU32 m_unk0x74; // 0x74 MxU32 m_unk0x74; // 0x74
MxStillPresenter* m_buffer[7]; // 0x78 MxStillPresenter* m_buffer[7]; // 0x78
}; };

26
LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
View File

@ -368,7 +368,7 @@ void Infocenter::ReadyWorld()
PlayMusic(JukeBox::e_informationCenter); PlayMusic(JukeBox::e_informationCenter);
InfomainScript script = InfomainScript script =
(InfomainScript) m_infocenterState->GetReturnDialogue()[GameState()->GetCurrentAct()].Next(); (InfomainScript) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next();
PlayAction(script); PlayAction(script);
if (script == c_returnBackGuidanceDialogue2) { if (script == c_returnBackGuidanceDialogue2) {
@ -434,7 +434,7 @@ void Infocenter::ReadyWorld()
m_transitionDestination = 0x2e; m_transitionDestination = 0x2e;
InfomainScript script = InfomainScript script =
(InfomainScript) m_infocenterState->GetReturnDialogue()[GameState()->GetCurrentAct()].Next(); (InfomainScript) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next();
PlayAction(script); PlayAction(script);
InputManager()->DisableInputProcessing(); InputManager()->DisableInputProcessing();
@ -444,7 +444,7 @@ void Infocenter::ReadyWorld()
PlayMusic(JukeBox::e_informationCenter); PlayMusic(JukeBox::e_informationCenter);
InfomainScript script = InfomainScript script =
(InfomainScript) m_infocenterState->GetReturnDialogue()[GameState()->GetCurrentAct()].Next(); (InfomainScript) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next();
PlayAction(script); PlayAction(script);
bgRed->Enable(TRUE); bgRed->Enable(TRUE);
break; break;
@ -490,7 +490,7 @@ void Infocenter::ReadyWorld()
m_transitionDestination = 0x2f; m_transitionDestination = 0x2f;
InfomainScript script = InfomainScript script =
(InfomainScript) m_infocenterState->GetReturnDialogue()[GameState()->GetCurrentAct()].Next(); (InfomainScript) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next();
PlayAction(script); PlayAction(script);
InputManager()->DisableInputProcessing(); InputManager()->DisableInputProcessing();
@ -500,7 +500,7 @@ void Infocenter::ReadyWorld()
PlayMusic(JukeBox::e_informationCenter); PlayMusic(JukeBox::e_informationCenter);
InfomainScript script = InfomainScript script =
(InfomainScript) m_infocenterState->GetReturnDialogue()[GameState()->GetCurrentAct()].Next(); (InfomainScript) m_infocenterState->GetReturnDialogue(GameState()->GetCurrentAct()).Next();
PlayAction(script); PlayAction(script);
bgRed->Enable(TRUE); bgRed->Enable(TRUE);
break; break;
@ -830,7 +830,7 @@ MxU8 Infocenter::HandleButtonUp(MxS32 p_x, MxS32 p_y)
break; break;
default: default:
dialogueToPlay = dialogueToPlay =
(InfomainScript) m_infocenterState->GetLeaveDialogue()[GameState()->GetCurrentAct()].Next(); (InfomainScript) m_infocenterState->GetLeaveDialogue(GameState()->GetCurrentAct()).Next();
break; break;
} }
@ -840,7 +840,7 @@ MxU8 Infocenter::HandleButtonUp(MxS32 p_x, MxS32 p_y)
} }
else { else {
dialogueToPlay = dialogueToPlay =
(InfomainScript) m_infocenterState->GetLeaveDialogue()[GameState()->GetCurrentAct()].Next(); (InfomainScript) m_infocenterState->GetLeaveDialogue(GameState()->GetCurrentAct()).Next();
} }
PlayAction(dialogueToPlay); PlayAction(dialogueToPlay);
@ -876,7 +876,7 @@ MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param)
m_transitionDestination = 5; m_transitionDestination = 5;
} }
else { else {
MxU32 objectId = m_infocenterState->GetUnknown0x68().Next(); MxU32 objectId = m_infocenterState->GetBricksterDialogue().Next();
PlayAction((InfomainScript) objectId); PlayAction((InfomainScript) objectId);
} }
@ -891,7 +891,7 @@ MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param)
m_transitionDestination = 13; m_transitionDestination = 13;
} }
else { else {
MxU32 objectId = m_infocenterState->GetUnknown0x68().Next(); MxU32 objectId = m_infocenterState->GetBricksterDialogue().Next();
PlayAction((InfomainScript) objectId); PlayAction((InfomainScript) objectId);
} }
@ -942,7 +942,7 @@ MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param)
m_infocenterState->SetUnknown0x74(5); m_infocenterState->SetUnknown0x74(5);
m_transitionDestination = state->GetPreviousArea(); m_transitionDestination = state->GetPreviousArea();
actionToPlay = actionToPlay =
(InfomainScript) m_infocenterState->GetLeaveDialogue()[GameState()->GetCurrentAct()].Next(); (InfomainScript) m_infocenterState->GetLeaveDialogue(GameState()->GetCurrentAct()).Next();
m_radio.Stop(); m_radio.Stop();
InputManager()->DisableInputProcessing(); InputManager()->DisableInputProcessing();
InputManager()->SetUnknown336(TRUE); InputManager()->SetUnknown336(TRUE);
@ -953,7 +953,7 @@ MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param)
m_infocenterState->SetUnknown0x74(5); m_infocenterState->SetUnknown0x74(5);
m_transitionDestination = state->GetPreviousArea(); m_transitionDestination = state->GetPreviousArea();
actionToPlay = actionToPlay =
(InfomainScript) m_infocenterState->GetLeaveDialogue()[GameState()->GetCurrentAct()] (InfomainScript) m_infocenterState->GetLeaveDialogue(GameState()->GetCurrentAct())
.Next(); .Next();
m_radio.Stop(); m_radio.Stop();
InputManager()->DisableInputProcessing(); InputManager()->DisableInputProcessing();
@ -971,7 +971,7 @@ MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param)
m_infocenterState->SetUnknown0x74(5); m_infocenterState->SetUnknown0x74(5);
m_transitionDestination = 0x2e; m_transitionDestination = 0x2e;
actionToPlay = actionToPlay =
(InfomainScript) m_infocenterState->GetLeaveDialogue()[GameState()->GetCurrentAct()].Next(); (InfomainScript) m_infocenterState->GetLeaveDialogue(GameState()->GetCurrentAct()).Next();
InputManager()->DisableInputProcessing(); InputManager()->DisableInputProcessing();
InputManager()->SetUnknown336(TRUE); InputManager()->SetUnknown336(TRUE);
break; break;
@ -979,7 +979,7 @@ MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param)
m_infocenterState->SetUnknown0x74(5); m_infocenterState->SetUnknown0x74(5);
m_transitionDestination = 0x2f; m_transitionDestination = 0x2f;
actionToPlay = actionToPlay =
(InfomainScript) m_infocenterState->GetLeaveDialogue()[GameState()->GetCurrentAct()].Next(); (InfomainScript) m_infocenterState->GetLeaveDialogue(GameState()->GetCurrentAct()).Next();
InputManager()->DisableInputProcessing(); InputManager()->DisableInputProcessing();
InputManager()->SetUnknown336(TRUE); InputManager()->SetUnknown336(TRUE);
break; break;

5
LEGO1/lego/legoomni/src/infocenter/infocenterstate.cpp
View File

@ -1,7 +1,6 @@
#include "infocenterstate.h" #include "infocenterstate.h"
#include "infocenter.h" #include "infocenter.h"
#include "legogamestate.h"
DECOMP_SIZE_ASSERT(InfocenterState, 0x94); DECOMP_SIZE_ASSERT(InfocenterState, 0x94);
@ -80,7 +79,7 @@ Infocenter::InfomainScript g_leaveDialogueAct3[4] = {
}; };
// GLOBAL: LEGO1 0x100f7760 // GLOBAL: LEGO1 0x100f7760
Infocenter::InfomainScript g_unk0x100f7760[2] = {Infocenter::c_bricksterDialogue, Infocenter::c_bricksterLaughs}; Infocenter::InfomainScript g_bricksterDialogue[2] = {Infocenter::c_bricksterDialogue, Infocenter::c_bricksterLaughs};
// FUNCTION: LEGO1 0x10071600 // FUNCTION: LEGO1 0x10071600
InfocenterState::InfocenterState() InfocenterState::InfocenterState()
@ -106,7 +105,7 @@ InfocenterState::InfocenterState()
m_leaveDialogue[LegoGameState::e_act3] = m_leaveDialogue[LegoGameState::e_act3] =
LegoState::Playlist((MxU32*) g_leaveDialogueAct3, _countof(g_leaveDialogueAct3) - 1); LegoState::Playlist((MxU32*) g_leaveDialogueAct3, _countof(g_leaveDialogueAct3) - 1);
m_unk0x68 = LegoState::Playlist((MxU32*) g_unk0x100f7760, _countof(g_unk0x100f7760)); m_bricksterDialogue = LegoState::Playlist((MxU32*) g_bricksterDialogue, _countof(g_bricksterDialogue));
memset(m_buffer, 0, sizeof(m_buffer)); memset(m_buffer, 0, sizeof(m_buffer));
} }