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 function

Browse Source
This commit is contained in:
Christian Semmler 2024-02-11 09:57:30 -05:00
parent 4c3ee56c3f
commit d815e917cd
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@ class InfocenterState : public LegoState {
inline MxS16 GetMaxNameLength() { return _countof(m_letters); }
inline MxStillPresenter* GetNameLetter(MxS32 p_index) { return m_letters[p_index]; }
inline MxBool DoesNameExist() { return m_letters[0] != NULL; }
inline MxBool ProfileSelected() { return m_letters[0] != NULL; }
inline Playlist& GetExitDialogueAct1() { return m_exitDialogueAct1; }
inline Playlist& GetExitDialogueAct23() { return m_exitDialogueAct23; }
inline Playlist& GetReturnDialogue(LegoGameState::Act p_act) { return m_returnDialogue[p_act]; }

2
LEGO1/lego/legoomni/src/common/legogamestate.cpp
View File

@ -126,7 +126,7 @@ MxResult LegoGameState::Save(MxULong p_slot)
MxResult result;
InfocenterState* infocenterState = (InfocenterState*) GameState()->GetState("InfocenterState");
if (!infocenterState || !infocenterState->DoesNameExist()) {
if (!infocenterState || !infocenterState->ProfileSelected()) {
result = SUCCESS;
}
else {

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

@ -267,7 +267,7 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param)
PlayAction(c_welcomeDialogue);
m_currentCutscene = e_noIntro;
if (!m_infocenterState->DoesNameExist()) {
if (!m_infocenterState->ProfileSelected()) {
m_bookAnimationTimer = 1;
return 1;
}
@ -311,7 +311,7 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param)
}
break;
case 11:
if (!m_infocenterState->DoesNameExist() && m_currentInfomainScript != c_mamaMovie &&
if (!m_infocenterState->ProfileSelected() && m_currentInfomainScript != c_mamaMovie &&
m_currentInfomainScript != c_papaMovie && m_currentInfomainScript != c_pepperMovie &&
m_currentInfomainScript != c_nickMovie && m_currentInfomainScript != c_lauraMovie) {
m_infoManDialogueTimer = 1;
@ -355,7 +355,7 @@ void Infocenter::ReadyWorld()
break;
case 4:
m_infocenterState->SetUnknown0x74(2);
if (!m_infocenterState->DoesNameExist()) {
if (!m_infocenterState->ProfileSelected()) {
m_bookAnimationTimer = 1;
}
@ -377,7 +377,7 @@ void Infocenter::ReadyWorld()
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
if (!m_infocenterState->DoesNameExist()) {
if (!m_infocenterState->ProfileSelected()) {
m_bookAnimationTimer = 1;
}
@ -392,7 +392,7 @@ void Infocenter::ReadyWorld()
break;
case 0xf:
m_infocenterState->SetUnknown0x74(2);
if (!m_infocenterState->DoesNameExist()) {
if (!m_infocenterState->ProfileSelected()) {
m_bookAnimationTimer = 1;
}
@ -622,7 +622,7 @@ MxLong Infocenter::HandleKeyPress(MxS8 p_key)
StopCutscene();
m_infocenterState->SetUnknown0x74(1);
if (!m_infocenterState->DoesNameExist()) {
if (!m_infocenterState->ProfileSelected()) {
m_bookAnimationTimer = 1;
return 1;
}
@ -801,7 +801,7 @@ MxU8 Infocenter::HandleButtonUp(MxS32 p_x, MxS32 p_y)
InfomainScript dialogueToPlay;
if (GameState()->GetCurrentAct() == LegoGameState::e_act1) {
if (!m_infocenterState->DoesNameExist()) {
if (!m_infocenterState->ProfileSelected()) {
m_infocenterState->SetUnknown0x74(2);
m_transitionDestination = LegoGameState::e_noArea;
dialogueToPlay = c_registerToContinueDialogue;
@ -949,7 +949,7 @@ MxU8 Infocenter::HandleClick(LegoControlManagerEvent& p_param)
break;
case LegoGameState::e_unk4:
if (state->GetUnknownC()) {
if (m_infocenterState->DoesNameExist()) {
if (m_infocenterState->ProfileSelected()) {
m_infocenterState->SetUnknown0x74(5);
m_transitionDestination = state->GetPreviousArea();
actionToPlay =
@ -1069,7 +1069,7 @@ MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param)
}
case 7:
if (m_infocenterState->GetUnknown0x74() == 8) {
if (m_infocenterState->DoesNameExist()) {
if (m_infocenterState->ProfileSelected()) {
GameState()->Save(0);
}

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

@ -111,7 +111,7 @@ MxLong InfocenterDoor::HandleClick(LegoControlManagerEvent& p_param)
case 4:
if (GameState()->GetUnknownC()) {
InfocenterState* state = (InfocenterState*) GameState()->GetState("InfocenterState");
if (state->DoesNameExist()) {
if (state->ProfileSelected()) {
m_unk0xf8 = LegoGameState::e_unk4;
}
else {