From 56c3a03c6c217a97b71a52734d3d3d3318abe790 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Wed, 17 Jan 2024 09:35:23 -0500 Subject: [PATCH] Change enum --- LEGO1/lego/legoomni/include/infocenter.h | 28 ++++++------- .../legoomni/src/infocenter/infocenter.cpp | 40 +++++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h index b588d5b6..f47799b3 100644 --- a/LEGO1/lego/legoomni/include/infocenter.h +++ b/LEGO1/lego/legoomni/include/infocenter.h @@ -29,23 +29,23 @@ class Infocenter : public LegoWorld { }; enum InfomainScript { - e_noInfomain = -1, - e_welcomeDialogue = 500, - e_randomDialogue1 = 502, - e_letsGetStarted = 504, - e_returnBack = 514, - e_exitConfirmation = 522, - e_goodEndingDialogue = 539, - e_badEndingDialogue = 540, - e_pepperCharacterSelect = 541, - e_mamaCharacterSelect = 542, - e_papaCharacterSelect = 543, - e_officierCharacterSelect = 544, - e_loraCharacterSelect = 545, + c_noInfomain = -1, + c_welcomeDialogue = 500, + c_randomDialogue1 = 502, + c_letsGetStarted = 504, + c_returnBack = 514, + c_exitConfirmation = 522, + c_goodEndingDialogue = 539, + c_badEndingDialogue = 540, + c_pepperCharacterSelect = 541, + c_mamaCharacterSelect = 542, + c_papaCharacterSelect = 543, + c_officierCharacterSelect = 544, + c_loraCharacterSelect = 545, }; enum SndAmimScript { - e_bookWig = 400 + c_bookWig = 400 }; Infocenter(); diff --git a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp index 58b62b5f..e6806f3f 100644 --- a/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp +++ b/LEGO1/lego/legoomni/src/infocenter/infocenter.cpp @@ -31,7 +31,7 @@ Infocenter::Infocenter() m_unk0x1cc = 0; m_unk0x11c = 0; m_unk0x104 = 0; - m_currentInfomainScript = e_noInfomain; + m_currentInfomainScript = c_noInfomain; m_currentIntroScript = e_noIntro; memset(&m_entries, 0, sizeof(InfocenterUnkDataEntry) * 7); @@ -150,19 +150,19 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param) switch (m_unk0xfc) { case 1: - PlayDialogue(e_pepperCharacterSelect); + PlayDialogue(c_pepperCharacterSelect); break; case 2: - PlayDialogue(e_mamaCharacterSelect); + PlayDialogue(c_mamaCharacterSelect); break; case 3: - PlayDialogue(e_papaCharacterSelect); + PlayDialogue(c_papaCharacterSelect); break; case 4: - PlayDialogue(e_officierCharacterSelect); + PlayDialogue(c_officierCharacterSelect); break; case 5: - PlayDialogue(e_loraCharacterSelect); + PlayDialogue(c_loraCharacterSelect); break; default: break; @@ -177,7 +177,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param) if (result || (action->GetAtomId() != m_atom && action->GetAtomId() != *g_introScript)) return result; - if (action->GetObjectId() == e_returnBack) { + if (action->GetObjectId() == c_returnBack) { ControlManager()->FUN_100293c0(0x10, action->GetAtomId(), 0); m_unk0x1d6 = 0; } @@ -194,13 +194,13 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param) case e_badEndMovie: StopCutscene(); m_infocenterState->SetUnknown0x74(11); - PlayDialogue(e_badEndingDialogue); + PlayDialogue(c_badEndingDialogue); m_currentIntroScript = e_noIntro; return 1; case e_goodEndMovie: StopCutscene(); m_infocenterState->SetUnknown0x74(11); - PlayDialogue(e_goodEndingDialogue); + PlayDialogue(c_goodEndingDialogue); m_currentIntroScript = e_noIntro; return 1; } @@ -208,7 +208,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param) // default / 2nd case probably? StopCutscene(); m_infocenterState->SetUnknown0x74(11); - PlayDialogue(e_welcomeDialogue); + PlayDialogue(c_welcomeDialogue); m_currentIntroScript = e_noIntro; if (m_infocenterState->GetInfocenterBufferElement(0) == 0) { @@ -221,13 +221,13 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param) switch (m_currentIntroScript) { case e_badEndMovie: - PlayDialogue(e_badEndingDialogue); + PlayDialogue(c_badEndingDialogue); break; case e_goodEndMovie: - PlayDialogue(e_goodEndingDialogue); + PlayDialogue(c_goodEndingDialogue); break; default: - PlayDialogue(e_welcomeDialogue); + PlayDialogue(c_welcomeDialogue); } m_currentIntroScript = e_noIntro; @@ -302,7 +302,7 @@ void Infocenter::VTable0x50() m_unk0x1d2 = 1; } - PlayDialogue(e_letsGetStarted); + PlayDialogue(c_letsGetStarted); PlayMusic(11); FUN_10015820(0, 7); return; @@ -312,7 +312,7 @@ void Infocenter::VTable0x50() break; case 8: PlayMusic(11); - PlayDialogue(e_exitConfirmation); + PlayDialogue(c_exitConfirmation); FUN_10015820(0, 7); return; case 0xf: @@ -320,7 +320,7 @@ void Infocenter::VTable0x50() m_unk0x1d2 = 1; } - PlayDialogue(e_randomDialogue1); + PlayDialogue(c_randomDialogue1); PlayMusic(11); FUN_10015820(0, 7); return; @@ -526,13 +526,13 @@ void Infocenter::PlayDialogue(InfomainScript p_objectId) // FUNCTION: LEGO1 0x100713d0 void Infocenter::StopCurrentDialogue() { - if (m_currentInfomainScript != e_noInfomain) { + if (m_currentInfomainScript != c_noInfomain) { MxDSAction action; action.SetObjectId(m_currentInfomainScript); action.SetAtomId(*g_infomainScript); action.SetUnknown24(-2); DeleteObject(action); - m_currentInfomainScript = e_noInfomain; + m_currentInfomainScript = c_noInfomain; } } @@ -540,7 +540,7 @@ void Infocenter::StopCurrentDialogue() void Infocenter::PlayBookAnimation() { MxDSAction action; - action.SetObjectId(e_bookWig); + action.SetObjectId(c_bookWig); action.SetAtomId(*g_sndAnimScript); Start(&action); } @@ -549,7 +549,7 @@ void Infocenter::PlayBookAnimation() void Infocenter::StopBookAnimation() { MxDSAction action; - action.SetObjectId(e_bookWig); + action.SetObjectId(c_bookWig); action.SetAtomId(*g_sndAnimScript); action.SetUnknown24(-2); DeleteObject(action);