isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-05-09 08:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

format

Browse Source
This commit is contained in:
Ramen2X 2024-03-10 09:42:31 -04:00
parent a7693099c6
commit 5923f01b40
32 changed files with 7507 additions and 7487 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,8 +3,8 @@
#include "decomp.h" #include "decomp.h"
#include "jukebox_actions.h" #include "jukebox_actions.h"
#include "jukeboxw_actions.h"
#include "jukeboxstate.h" #include "jukeboxstate.h"
#include "jukeboxw_actions.h"
#include "legocontrolmanager.h" #include "legocontrolmanager.h"
#include "legogamestate.h" #include "legogamestate.h"
#include "legoworld.h" #include "legoworld.h"

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

@ -67,8 +67,12 @@ InfomainScript::Script g_leaveDialogueAct1[4] = {
}; };
// GLOBAL: LEGO1 0x100f7740 // GLOBAL: LEGO1 0x100f7740
InfomainScript::Script g_leaveDialogueAct2[4] = InfomainScript::Script g_leaveDialogueAct2[4] = {
{InfomainScript::c_iic051in_PlayWav, InfomainScript::c_iic052in_PlayWav, InfomainScript::c_iic053in_PlayWav, InfomainScript::c_iic054in_PlayWav}; InfomainScript::c_iic051in_PlayWav,
InfomainScript::c_iic052in_PlayWav,
InfomainScript::c_iic053in_PlayWav,
InfomainScript::c_iic054in_PlayWav
};
// GLOBAL: LEGO1 0x100f7750 // GLOBAL: LEGO1 0x100f7750
InfomainScript::Script g_leaveDialogueAct3[4] = { InfomainScript::Script g_leaveDialogueAct3[4] = {
@ -79,7 +83,10 @@ InfomainScript::Script g_leaveDialogueAct3[4] = {
}; };
// GLOBAL: LEGO1 0x100f7760 // GLOBAL: LEGO1 0x100f7760
InfomainScript::Script g_bricksterDialogue[2] = {InfomainScript::c_sbleh2br_PlayWav, InfomainScript::c_snshahbr_PlayWav}; InfomainScript::Script g_bricksterDialogue[2] = {
InfomainScript::c_sbleh2br_PlayWav,
InfomainScript::c_snshahbr_PlayWav
};
// FUNCTION: LEGO1 0x10071600 // FUNCTION: LEGO1 0x10071600
InfocenterState::InfocenterState() InfocenterState::InfocenterState()

47
LEGO1/lego/legoomni/src/worlds/infocenter.cpp
View File

@ -195,9 +195,10 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param)
return 1; return 1;
} }
if (action->GetAtomId() == m_atom && if (action->GetAtomId() == m_atom && (action->GetObjectId() == InfomainScript::c_Mama_All_Movie ||
(action->GetObjectId() == InfomainScript::c_Mama_All_Movie || action->GetObjectId() == InfomainScript::c_Papa_All_Movie || action->GetObjectId() == InfomainScript::c_Papa_All_Movie ||
action->GetObjectId() == InfomainScript::c_Pepper_All_Movie || action->GetObjectId() == InfomainScript::c_Nick_All_Movie || action->GetObjectId() == InfomainScript::c_Pepper_All_Movie ||
action->GetObjectId() == InfomainScript::c_Nick_All_Movie ||
action->GetObjectId() == InfomainScript::c_Laura_All_Movie)) { action->GetObjectId() == InfomainScript::c_Laura_All_Movie)) {
if (m_unk0x1d4) { if (m_unk0x1d4) {
m_unk0x1d4--; m_unk0x1d4--;
@ -298,7 +299,8 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param)
BackgroundAudioManager()->RaiseVolume(); BackgroundAudioManager()->RaiseVolume();
return 1; return 1;
case 4: case 4:
if (action->GetObjectId() == InfomainScript::c_GoTo_RegBook || action->GetObjectId() == InfomainScript::c_GoTo_RegBook_Red) { if (action->GetObjectId() == InfomainScript::c_GoTo_RegBook ||
action->GetObjectId() == InfomainScript::c_GoTo_RegBook_Red) {
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 50, FALSE, FALSE);
m_infocenterState->SetUnknown0x74(14); m_infocenterState->SetUnknown0x74(14);
return 1; return 1;
@ -316,8 +318,10 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param)
break; break;
case 11: case 11:
if (!m_infocenterState->HasRegistered() && m_currentInfomainScript != InfomainScript::c_Mama_All_Movie && if (!m_infocenterState->HasRegistered() && m_currentInfomainScript != InfomainScript::c_Mama_All_Movie &&
m_currentInfomainScript != InfomainScript::c_Papa_All_Movie && m_currentInfomainScript != InfomainScript::c_Pepper_All_Movie && m_currentInfomainScript != InfomainScript::c_Papa_All_Movie &&
m_currentInfomainScript != InfomainScript::c_Nick_All_Movie && m_currentInfomainScript != InfomainScript::c_Laura_All_Movie) { m_currentInfomainScript != InfomainScript::c_Pepper_All_Movie &&
m_currentInfomainScript != InfomainScript::c_Nick_All_Movie &&
m_currentInfomainScript != InfomainScript::c_Laura_All_Movie) {
m_infoManDialogueTimer = 1; m_infoManDialogueTimer = 1;
PlayMusic(JukeboxScript::c_InformationCenter_Music); PlayMusic(JukeboxScript::c_InformationCenter_Music);
} }
@ -834,7 +838,8 @@ MxU8 Infocenter::HandleButtonUp(MxS32 p_x, MxS32 p_y)
break; break;
default: default:
dialogueToPlay = dialogueToPlay =
(InfomainScript::Script) m_infocenterState->GetLeaveDialogue(GameState()->GetCurrentAct()).Next(); (InfomainScript::Script) m_infocenterState->GetLeaveDialogue(GameState()->GetCurrentAct())
.Next();
break; break;
} }
@ -946,7 +951,8 @@ 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::Script) m_infocenterState->GetLeaveDialogue(GameState()->GetCurrentAct()).Next(); (InfomainScript::Script) m_infocenterState->GetLeaveDialogue(GameState()->GetCurrentAct())
.Next();
m_radio.Stop(); m_radio.Stop();
InputManager()->DisableInputProcessing(); InputManager()->DisableInputProcessing();
InputManager()->SetUnknown336(TRUE); InputManager()->SetUnknown336(TRUE);
@ -956,8 +962,8 @@ MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param)
if (m_infocenterState->HasRegistered()) { if (m_infocenterState->HasRegistered()) {
m_infocenterState->SetUnknown0x74(5); m_infocenterState->SetUnknown0x74(5);
m_transitionDestination = state->GetPreviousArea(); m_transitionDestination = state->GetPreviousArea();
actionToPlay = actionToPlay = (InfomainScript::Script) m_infocenterState
(InfomainScript::Script) m_infocenterState->GetLeaveDialogue(GameState()->GetCurrentAct()) ->GetLeaveDialogue(GameState()->GetCurrentAct())
.Next(); .Next();
m_radio.Stop(); m_radio.Stop();
InputManager()->DisableInputProcessing(); InputManager()->DisableInputProcessing();
@ -992,7 +998,8 @@ MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param)
case InfomainScript::c_Book_Ctl: case InfomainScript::c_Book_Ctl:
m_transitionDestination = LegoGameState::e_regbook; m_transitionDestination = LegoGameState::e_regbook;
m_infocenterState->SetUnknown0x74(4); m_infocenterState->SetUnknown0x74(4);
actionToPlay = GameState()->GetCurrentAct() != LegoGameState::e_act1 ? InfomainScript::c_GoTo_RegBook_Red : InfomainScript::c_GoTo_RegBook; actionToPlay = GameState()->GetCurrentAct() != LegoGameState::e_act1 ? InfomainScript::c_GoTo_RegBook_Red
: InfomainScript::c_GoTo_RegBook;
m_radio.Stop(); m_radio.Stop();
GameState()->SetUnknown0x42c(GameState()->GetPreviousArea()); GameState()->SetUnknown0x42c(GameState()->GetPreviousArea());
InputManager()->DisableInputProcessing(); InputManager()->DisableInputProcessing();
@ -1087,12 +1094,18 @@ MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param)
} }
else { else {
if (sender->IsA("Radio") && m_radio.GetState()->IsActive()) { if (sender->IsA("Radio") && m_radio.GetState()->IsActive()) {
if (m_currentInfomainScript == InfomainScript::c_Mama_All_Movie || m_currentInfomainScript == InfomainScript::c_Papa_All_Movie || if (m_currentInfomainScript == InfomainScript::c_Mama_All_Movie ||
m_currentInfomainScript == InfomainScript::c_Pepper_All_Movie || m_currentInfomainScript == InfomainScript::c_Nick_All_Movie || m_currentInfomainScript == InfomainScript::c_Papa_All_Movie ||
m_currentInfomainScript == InfomainScript::c_Laura_All_Movie || m_currentInfomainScript == InfomainScript::c_iic007ra_PlayWav || m_currentInfomainScript == InfomainScript::c_Pepper_All_Movie ||
m_currentInfomainScript == InfomainScript::c_ijs002ra_PlayWav || m_currentInfomainScript == InfomainScript::c_irt001ra_PlayWav || m_currentInfomainScript == InfomainScript::c_Nick_All_Movie ||
m_currentInfomainScript == InfomainScript::c_ipz006ra_PlayWav || m_currentInfomainScript == InfomainScript::c_igs004ra_PlayWav || m_currentInfomainScript == InfomainScript::c_Laura_All_Movie ||
m_currentInfomainScript == InfomainScript::c_iho003ra_PlayWav || m_currentInfomainScript == InfomainScript::c_ips005ra_PlayWav) { m_currentInfomainScript == InfomainScript::c_iic007ra_PlayWav ||
m_currentInfomainScript == InfomainScript::c_ijs002ra_PlayWav ||
m_currentInfomainScript == InfomainScript::c_irt001ra_PlayWav ||
m_currentInfomainScript == InfomainScript::c_ipz006ra_PlayWav ||
m_currentInfomainScript == InfomainScript::c_igs004ra_PlayWav ||
m_currentInfomainScript == InfomainScript::c_iho003ra_PlayWav ||
m_currentInfomainScript == InfomainScript::c_ips005ra_PlayWav) {
StopCurrentAction(); StopCurrentAction();
} }
} }