isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-30 19:51:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change enum

Browse Source
This commit is contained in:
Christian Semmler 2024-01-17 09:35:23 -05:00
parent a0b22f4681
commit 56c3a03c6c
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
LEGO1/lego/legoomni/include/infocenter.h
View File

@ -29,23 +29,23 @@ class Infocenter : public LegoWorld {
}; };
enum InfomainScript { enum InfomainScript {
e_noInfomain = -1, c_noInfomain = -1,
e_welcomeDialogue = 500, c_welcomeDialogue = 500,
e_randomDialogue1 = 502, c_randomDialogue1 = 502,
e_letsGetStarted = 504, c_letsGetStarted = 504,
e_returnBack = 514, c_returnBack = 514,
e_exitConfirmation = 522, c_exitConfirmation = 522,
e_goodEndingDialogue = 539, c_goodEndingDialogue = 539,
e_badEndingDialogue = 540, c_badEndingDialogue = 540,
e_pepperCharacterSelect = 541, c_pepperCharacterSelect = 541,
e_mamaCharacterSelect = 542, c_mamaCharacterSelect = 542,
e_papaCharacterSelect = 543, c_papaCharacterSelect = 543,
e_officierCharacterSelect = 544, c_officierCharacterSelect = 544,
e_loraCharacterSelect = 545, c_loraCharacterSelect = 545,
}; };
enum SndAmimScript { enum SndAmimScript {
e_bookWig = 400 c_bookWig = 400
}; };
Infocenter(); Infocenter();

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

@ -31,7 +31,7 @@ Infocenter::Infocenter()
m_unk0x1cc = 0; m_unk0x1cc = 0;
m_unk0x11c = 0; m_unk0x11c = 0;
m_unk0x104 = 0; m_unk0x104 = 0;
m_currentInfomainScript = e_noInfomain; m_currentInfomainScript = c_noInfomain;
m_currentIntroScript = e_noIntro; m_currentIntroScript = e_noIntro;
memset(&m_entries, 0, sizeof(InfocenterUnkDataEntry) * 7); memset(&m_entries, 0, sizeof(InfocenterUnkDataEntry) * 7);
@ -150,19 +150,19 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
switch (m_unk0xfc) { switch (m_unk0xfc) {
case 1: case 1:
PlayDialogue(e_pepperCharacterSelect); PlayDialogue(c_pepperCharacterSelect);
break; break;
case 2: case 2:
PlayDialogue(e_mamaCharacterSelect); PlayDialogue(c_mamaCharacterSelect);
break; break;
case 3: case 3:
PlayDialogue(e_papaCharacterSelect); PlayDialogue(c_papaCharacterSelect);
break; break;
case 4: case 4:
PlayDialogue(e_officierCharacterSelect); PlayDialogue(c_officierCharacterSelect);
break; break;
case 5: case 5:
PlayDialogue(e_loraCharacterSelect); PlayDialogue(c_loraCharacterSelect);
break; break;
default: default:
break; break;
@ -177,7 +177,7 @@ MxLong Infocenter::HandleEndAction(MxParam& p_param)
if (result || (action->GetAtomId() != m_atom && action->GetAtomId() != *g_introScript)) if (result || (action->GetAtomId() != m_atom && action->GetAtomId() != *g_introScript))
return result; return result;
if (action->GetObjectId() == e_returnBack) { if (action->GetObjectId() == c_returnBack) {
ControlManager()->FUN_100293c0(0x10, action->GetAtomId(), 0); ControlManager()->FUN_100293c0(0x10, action->GetAtomId(), 0);
m_unk0x1d6 = 0; m_unk0x1d6 = 0;
} }
@ -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(e_badEndingDialogue); PlayDialogue(c_badEndingDialogue);
m_currentIntroScript = e_noIntro; m_currentIntroScript = e_noIntro;
return 1; return 1;
case e_goodEndMovie: case e_goodEndMovie:
StopCutscene(); StopCutscene();
m_infocenterState->SetUnknown0x74(11); m_infocenterState->SetUnknown0x74(11);
PlayDialogue(e_goodEndingDialogue); PlayDialogue(c_goodEndingDialogue);
m_currentIntroScript = e_noIntro; m_currentIntroScript = 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(e_welcomeDialogue); PlayDialogue(c_welcomeDialogue);
m_currentIntroScript = e_noIntro; m_currentIntroScript = 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_currentIntroScript) { switch (m_currentIntroScript) {
case e_badEndMovie: case e_badEndMovie:
PlayDialogue(e_badEndingDialogue); PlayDialogue(c_badEndingDialogue);
break; break;
case e_goodEndMovie: case e_goodEndMovie:
PlayDialogue(e_goodEndingDialogue); PlayDialogue(c_goodEndingDialogue);
break; break;
default: default:
PlayDialogue(e_welcomeDialogue); PlayDialogue(c_welcomeDialogue);
} }
m_currentIntroScript = e_noIntro; m_currentIntroScript = e_noIntro;
@ -302,7 +302,7 @@ void Infocenter::VTable0x50()
m_unk0x1d2 = 1; m_unk0x1d2 = 1;
} }
PlayDialogue(e_letsGetStarted); PlayDialogue(c_letsGetStarted);
PlayMusic(11); PlayMusic(11);
FUN_10015820(0, 7); FUN_10015820(0, 7);
return; return;
@ -312,7 +312,7 @@ void Infocenter::VTable0x50()
break; break;
case 8: case 8:
PlayMusic(11); PlayMusic(11);
PlayDialogue(e_exitConfirmation); PlayDialogue(c_exitConfirmation);
FUN_10015820(0, 7); FUN_10015820(0, 7);
return; return;
case 0xf: case 0xf:
@ -320,7 +320,7 @@ void Infocenter::VTable0x50()
m_unk0x1d2 = 1; m_unk0x1d2 = 1;
} }
PlayDialogue(e_randomDialogue1); PlayDialogue(c_randomDialogue1);
PlayMusic(11); PlayMusic(11);
FUN_10015820(0, 7); FUN_10015820(0, 7);
return; return;
@ -526,13 +526,13 @@ void Infocenter::PlayDialogue(InfomainScript p_objectId)
// FUNCTION: LEGO1 0x100713d0 // FUNCTION: LEGO1 0x100713d0
void Infocenter::StopCurrentDialogue() void Infocenter::StopCurrentDialogue()
{ {
if (m_currentInfomainScript != e_noInfomain) { if (m_currentInfomainScript != c_noInfomain) {
MxDSAction action; MxDSAction action;
action.SetObjectId(m_currentInfomainScript); action.SetObjectId(m_currentInfomainScript);
action.SetAtomId(*g_infomainScript); action.SetAtomId(*g_infomainScript);
action.SetUnknown24(-2); action.SetUnknown24(-2);
DeleteObject(action); DeleteObject(action);
m_currentInfomainScript = e_noInfomain; m_currentInfomainScript = c_noInfomain;
} }
} }
@ -540,7 +540,7 @@ void Infocenter::StopCurrentDialogue()
void Infocenter::PlayBookAnimation() void Infocenter::PlayBookAnimation()
{ {
MxDSAction action; MxDSAction action;
action.SetObjectId(e_bookWig); action.SetObjectId(c_bookWig);
action.SetAtomId(*g_sndAnimScript); action.SetAtomId(*g_sndAnimScript);
Start(&action); Start(&action);
} }
@ -549,7 +549,7 @@ void Infocenter::PlayBookAnimation()
void Infocenter::StopBookAnimation() void Infocenter::StopBookAnimation()
{ {
MxDSAction action; MxDSAction action;
action.SetObjectId(e_bookWig); action.SetObjectId(c_bookWig);
action.SetAtomId(*g_sndAnimScript); action.SetAtomId(*g_sndAnimScript);
action.SetUnknown24(-2); action.SetUnknown24(-2);
DeleteObject(action); DeleteObject(action);