mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-24 08:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

add jukeboxscript enum (#466)

Browse Source
This commit is contained in:
Ramen2X
2024-01-20 12:41:22 -05:00
committed by GitHub
parent 9a3df8d9f8
commit 961282e3c6
6 changed files with 99 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
View File

@@ -1,5 +1,6 @@
#include "elevatorbottom.h"
#include "jukebox.h"
#include "legocontrolmanager.h"
#include "legogamestate.h"
#include "legoinputmanager.h"
@@ -67,7 +68,7 @@ MxLong ElevatorBottom::Notify(MxParam& p_param)
void ElevatorBottom::VTable0x50()
{
LegoWorld::VTable0x50();
PlayMusic(11);
PlayMusic(JukeBox::e_informationCenter);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
}

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

@@ -1,6 +1,7 @@
#include "infocenter.h"
#include "infocenterstate.h"
#include "jukebox.h"
#include "legocontrolmanager.h"
#include "legogamestate.h"
#include "legoinputmanager.h"
@@ -165,7 +166,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
}
if (!m_unk0x1d4) {
PlayMusic(11);
PlayMusic(JukeBox::e_informationCenter);
GameState()->FUN_10039780(m_unk0xfc);
switch (m_unk0xfc) {
@@ -279,7 +280,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
m_currentInfomainScript != 41 && m_currentInfomainScript != 42 && m_currentInfomainScript != 43 &&
m_currentInfomainScript != 44) {
m_infoManDialogueTimer = 1;
PlayMusic(11);
PlayMusic(JukeBox::e_informationCenter);
}
m_infocenterState->SetUnknown0x74(2);
@@ -323,15 +324,15 @@ void Infocenter::VTable0x50()
}
PlayAction(c_letsGetStartedDialogue);
PlayMusic(11);
PlayMusic(JukeBox::e_informationCenter);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
return;
default:
PlayMusic(11);
PlayMusic(JukeBox::e_informationCenter);
// TODO
break;
case 8:
PlayMusic(11);
PlayMusic(JukeBox::e_informationCenter);
PlayAction(c_exitConfirmationDialogue);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
return;
@@ -341,7 +342,7 @@ void Infocenter::VTable0x50()
}
PlayAction(c_clickOnInfomanDialogue);
PlayMusic(11);
PlayMusic(JukeBox::e_informationCenter);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
return;
}

3
LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
View File

@@ -1,5 +1,6 @@
#include "infocenterdoor.h"
#include "jukebox.h"
#include "legocontrolmanager.h"
#include "legogamestate.h"
#include "legoinputmanager.h"
@@ -55,7 +56,7 @@ MxLong InfocenterDoor::Notify(MxParam& p_param)
void InfocenterDoor::VTable0x50()
{
LegoWorld::VTable0x50();
PlayMusic(11);
PlayMusic(JukeBox::e_informationCenter);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
}

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

@@ -2,6 +2,7 @@
#include "ambulancemissionstate.h"
#include "gifmanager.h"
#include "jukebox.h"
#include "legocontrolmanager.h"
#include "legogamestate.h"
#include "legoinputmanager.h"
@@ -119,7 +120,7 @@ MxLong Score::FUN_10001510(MxEndActionNotificationParam& p_param)
TransitionManager()->StartTransition(MxTransitionManager::e_pixelation, 0x32, 0, 0);
break;
case 0x1f5:
PlayMusic(11);
PlayMusic(JukeBox::e_informationCenter);
m_state->SetTutorialFlag(FALSE);
}
}
@@ -145,7 +146,7 @@ void Score::VTable0x50()
Start(&action);
}
else
PlayMusic(11);
PlayMusic(JukeBox::e_informationCenter);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
}