mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-26 18:04:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finish LegoVariables class (#698)

Browse Source 
* Finish LegoVariables class

* Update legonavcontroller.cpp

* Update legobackgroundcolor.cpp

* Match functions, style, refactor visible

* Use MxBool

* Merge/fix

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Misha
2024-03-19 14:44:42 -04:00
committed by GitHub
parent d92963982a
commit eaa935f646
18 changed files with 135 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
LEGO1/lego/legoomni/src/worlds/infocenter.cpp
View File

@@ -296,8 +296,8 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param)
m_currentCutscene = e_noIntro;
return 1;
case 2:
SetROIUnknown0x0c(g_object2x4red, 0);
SetROIUnknown0x0c(g_object2x4grn, 0);
SetROIVisible(g_object2x4red, FALSE);
SetROIVisible(g_object2x4grn, FALSE);
BackgroundAudioManager()->RaiseVolume();
return 1;
case 4:
@@ -329,7 +329,7 @@ MxLong Infocenter::HandleEndAction(MxEndActionNotificationParam& p_param)
}
m_infocenterState->SetUnknown0x74(2);
SetROIUnknown0x0c("infoman", 1);
SetROIVisible("infoman", TRUE);
return 1;
case 12:
if (action->GetObjectId() == m_currentInfomainScript) {
@@ -1067,15 +1067,15 @@ MxLong Infocenter::HandleNotification0(MxNotificationParam& p_param)
}
PlayAction(objectId);
SetROIUnknown0x0c(g_object2x4red, 0);
SetROIUnknown0x0c(g_object2x4grn, 0);
SetROIVisible(g_object2x4red, FALSE);
SetROIVisible(g_object2x4grn, FALSE);
return 1;
}
case 6:
if (m_infocenterState->GetUnknown0x74() == 8) {
StopCurrentAction();
SetROIUnknown0x0c(g_object2x4red, 0);
SetROIUnknown0x0c(g_object2x4grn, 0);
SetROIVisible(g_object2x4red, FALSE);
SetROIVisible(g_object2x4grn, FALSE);
m_infocenterState->SetUnknown0x74(2);
PlayAction(InfomainScript::c_iicb28in_RunAnim);
return 1;

12
LEGO1/lego/legoomni/src/worlds/isle.cpp
View File

@@ -773,11 +773,11 @@ void Isle::Enable(MxBool p_enable)
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
}
SetROIUnknown0x0c("stretch", 0);
SetROIUnknown0x0c("bird", 0);
SetROIUnknown0x0c("rcred", 0);
SetROIUnknown0x0c("towtk", 0);
SetROIUnknown0x0c("pizpie", 0);
SetROIVisible("stretch", FALSE);
SetROIVisible("bird", FALSE);
SetROIVisible("rcred", FALSE);
SetROIVisible("towtk", FALSE);
SetROIVisible("pizpie", FALSE);
}
else {
if (InputManager()->GetWorld() == this) {
@@ -828,7 +828,7 @@ MxLong Isle::HandleTransitionEnd()
switch (m_destLocation) {
case LegoGameState::e_infomain:
((LegoEntity*) Find(*g_isleScript, IsleScript::c_InfoCenter_Entity))->GetROI()->SetUnknown0x0c(1);
((LegoEntity*) Find(*g_isleScript, IsleScript::c_InfoCenter_Entity))->GetROI()->SetVisibility(TRUE);
GameState()->SwitchArea(m_destLocation);
m_destLocation = LegoGameState::e_undefined;
break;

2
LEGO1/lego/legoomni/src/worlds/registrationbook.cpp
View File

@@ -324,7 +324,7 @@ void RegistrationBook::ReadyWorld()
LegoROI* infoman = FindROI(g_infoman);
if (infoman != NULL) {
infoman->SetUnknown0x0c(0);
infoman->SetVisibility(FALSE);
}
}
else {