isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-02-16 19:50:15 -05:00
Code Issues Projects Releases Packages Wiki Activity

rename dialogue to action in methods (#454)

Browse source
This commit is contained in:
Ramen2X 2024-01-18 14:04:50 -05:00 committed by GitHub
parent 62e584b024
commit ffee6a4e5b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
LEGO1/lego/legoomni/include/infocenter.h
View file

@ -154,8 +154,8 @@ private:
void StartCredits(); void StartCredits();
void StopCredits(); void StopCredits();
void PlayDialogue(InfomainScript p_objectId); void PlayAction(InfomainScript p_objectId);
void StopCurrentDialogue(); void StopCurrentAction();
void PlayBookAnimation(); void PlayBookAnimation();
void StopBookAnimation(); void StopBookAnimation();

36
LEGO1/lego/legoomni/src/infocenter/infocenter.cpp
View file

@ -150,19 +150,19 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
switch (m_unk0xfc) { switch (m_unk0xfc) {
case 1: case 1:
PlayDialogue(c_pepperCharacterSelect); PlayAction(c_pepperCharacterSelect);
break; break;
case 2: case 2:
PlayDialogue(c_mamaCharacterSelect); PlayAction(c_mamaCharacterSelect);
break; break;
case 3: case 3:
PlayDialogue(c_papaCharacterSelect); PlayAction(c_papaCharacterSelect);
break; break;
case 4: case 4:
PlayDialogue(c_nickCharacterSelect); PlayAction(c_nickCharacterSelect);
break; break;
case 5: case 5:
PlayDialogue(c_lauraCharacterSelect); PlayAction(c_lauraCharacterSelect);
break; break;
default: default:
break; break;
@ -194,13 +194,13 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
case e_badEndMovie: case e_badEndMovie:
StopCutscene(); StopCutscene();
m_infocenterState->SetUnknown0x74(11); m_infocenterState->SetUnknown0x74(11);
PlayDialogue(c_badEndingDialogue); PlayAction(c_badEndingDialogue);
m_currentCutscene = e_noIntro; m_currentCutscene = e_noIntro;
return 1; return 1;
case e_goodEndMovie: case e_goodEndMovie:
StopCutscene(); StopCutscene();
m_infocenterState->SetUnknown0x74(11); m_infocenterState->SetUnknown0x74(11);
PlayDialogue(c_goodEndingDialogue); PlayAction(c_goodEndingDialogue);
m_currentCutscene = e_noIntro; m_currentCutscene = e_noIntro;
return 1; return 1;
} }
@ -208,7 +208,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
// default / 2nd case probably? // default / 2nd case probably?
StopCutscene(); StopCutscene();
m_infocenterState->SetUnknown0x74(11); m_infocenterState->SetUnknown0x74(11);
PlayDialogue(c_welcomeDialogue); PlayAction(c_welcomeDialogue);
m_currentCutscene = e_noIntro; m_currentCutscene = e_noIntro;
if (m_infocenterState->GetInfocenterBufferElement(0) == 0) { if (m_infocenterState->GetInfocenterBufferElement(0) == 0) {
@ -221,13 +221,13 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
switch (m_currentCutscene) { switch (m_currentCutscene) {
case e_badEndMovie: case e_badEndMovie:
PlayDialogue(c_badEndingDialogue); PlayAction(c_badEndingDialogue);
break; break;
case e_goodEndMovie: case e_goodEndMovie:
PlayDialogue(c_goodEndingDialogue); PlayAction(c_goodEndingDialogue);
break; break;
default: default:
PlayDialogue(c_welcomeDialogue); PlayAction(c_welcomeDialogue);
} }
m_currentCutscene = e_noIntro; m_currentCutscene = e_noIntro;
@ -302,7 +302,7 @@ void Infocenter::VTable0x50()
m_unk0x1d2 = 1; m_unk0x1d2 = 1;
} }
PlayDialogue(c_letsGetStartedDialogue); PlayAction(c_letsGetStartedDialogue);
PlayMusic(11); PlayMusic(11);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
return; return;
@ -312,7 +312,7 @@ void Infocenter::VTable0x50()
break; break;
case 8: case 8:
PlayMusic(11); PlayMusic(11);
PlayDialogue(c_exitConfirmationDialogue); PlayAction(c_exitConfirmationDialogue);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
return; return;
case 0xf: case 0xf:
@ -320,7 +320,7 @@ void Infocenter::VTable0x50()
m_unk0x1d2 = 1; m_unk0x1d2 = 1;
} }
PlayDialogue(c_clickOnInfomanDialogue); PlayAction(c_clickOnInfomanDialogue);
PlayMusic(11); PlayMusic(11);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
return; return;
@ -372,7 +372,7 @@ MxLong Infocenter::HandleKeyPress(MxS8 p_key)
break; break;
default: { default: {
InfomainScript script = m_currentInfomainScript; InfomainScript script = m_currentInfomainScript;
StopCurrentDialogue(); StopCurrentAction();
switch (m_infocenterState->GetUnknown0x74()) { switch (m_infocenterState->GetUnknown0x74()) {
case 5: case 5:
@ -511,12 +511,12 @@ void Infocenter::StopCredits()
} }
// FUNCTION: LEGO1 0x10071300 // FUNCTION: LEGO1 0x10071300
void Infocenter::PlayDialogue(InfomainScript p_objectId) void Infocenter::PlayAction(InfomainScript p_objectId)
{ {
MxDSAction action; MxDSAction action;
action.SetObjectId(p_objectId); action.SetObjectId(p_objectId);
action.SetAtomId(*g_infomainScript); action.SetAtomId(*g_infomainScript);
StopCurrentDialogue(); StopCurrentAction();
m_currentInfomainScript = p_objectId; m_currentInfomainScript = p_objectId;
BackgroundAudioManager()->LowerVolume(); BackgroundAudioManager()->LowerVolume();
@ -524,7 +524,7 @@ void Infocenter::PlayDialogue(InfomainScript p_objectId)
} }
// FUNCTION: LEGO1 0x100713d0 // FUNCTION: LEGO1 0x100713d0
void Infocenter::StopCurrentDialogue() void Infocenter::StopCurrentAction()
{ {
if (m_currentInfomainScript != c_noInfomain) { if (m_currentInfomainScript != c_noInfomain) {
MxDSAction action; MxDSAction action;