TheCloud/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2025-09-23 12:03:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Name Disable function in LegoOmni and misc (#1616)

Browse Source
This commit is contained in:
Fabian Neundorf 2025-07-12 02:10:36 +02:00 committed by GitHub
parent 6497cb42b7
commit a34c293177
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
28 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,7 +129,7 @@ public:
LegoROI* FindROI(const char* p_name); LegoROI* FindROI(const char* p_name);
void AddWorld(LegoWorld* p_world); void AddWorld(LegoWorld* p_world);
void DeleteWorld(LegoWorld* p_world); void DeleteWorld(LegoWorld* p_world);
void FUN_1005b4f0(MxBool p_disable, MxU16 p_flags); void Disable(MxBool p_disable, MxU16 p_flags);
void CreateBackgroundAudio(); void CreateBackgroundAudio();
void RemoveWorld(const MxAtomId& p_atom, MxLong p_objectId); void RemoveWorld(const MxAtomId& p_atom, MxLong p_objectId);
MxResult RegisterWorlds(); MxResult RegisterWorlds();

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

@ -48,7 +48,7 @@ LegoPlantManager* PlantManager();
LegoBuildingManager* BuildingManager(); LegoBuildingManager* BuildingManager();
LegoTextureContainer* TextureContainer(); LegoTextureContainer* TextureContainer();
ViewLODListManager* GetViewLODListManager(); ViewLODListManager* GetViewLODListManager();
void FUN_10015820(MxBool p_disable, MxU16 p_flags); void Disable(MxBool p_disable, MxU16 p_flags);
LegoROI* FindROI(const char* p_name); LegoROI* FindROI(const char* p_name);
void SetROIVisible(const char* p_name, MxBool p_visible); void SetROIVisible(const char* p_name, MxBool p_visible);
void SetUserActor(LegoPathActor* p_userActor); void SetUserActor(LegoPathActor* p_userActor);

2
LEGO1/lego/legoomni/src/actors/ambulance.cpp
View File

@ -372,7 +372,7 @@ MxLong Ambulance::HandleClick()
return 1; return 1;
} }
FUN_10015820(TRUE, 0); Disable(TRUE, 0);
((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::e_ambulance); ((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::e_ambulance);
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);

2
LEGO1/lego/legoomni/src/actors/bike.cpp
View File

@ -54,7 +54,7 @@ MxLong Bike::HandleClick()
{ {
if (CanExit()) { if (CanExit()) {
Act1State* state = (Act1State*) GameState()->GetState("Act1State"); Act1State* state = (Act1State*) GameState()->GetState("Act1State");
FUN_10015820(TRUE, 0); Disable(TRUE, 0);
((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::Area::e_bike); ((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::Area::e_bike);
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE);

2
LEGO1/lego/legoomni/src/actors/dunebuggy.cpp
View File

@ -92,7 +92,7 @@ MxLong DuneBuggy::HandleClick()
return 1; return 1;
} }
FUN_10015820(TRUE, 0); Disable(TRUE, 0);
((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::Area::e_dunecar); ((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::Area::e_dunecar);
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE);

2
LEGO1/lego/legoomni/src/actors/helicopter.cpp
View File

@ -148,7 +148,7 @@ MxLong Helicopter::HandleClick()
IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3 IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3
); );
((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::e_copter); ((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::e_copter);
FUN_10015820(TRUE, 0); Disable(TRUE, 0);
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE);
SetActorState(c_disabled); SetActorState(c_disabled);
PlayMusic(JukeboxScript::c_Jail_Music); PlayMusic(JukeboxScript::c_Jail_Music);

2
LEGO1/lego/legoomni/src/actors/jetski.cpp
View File

@ -85,7 +85,7 @@ MxLong Jetski::HandleClick()
return 1; return 1;
} }
FUN_10015820(TRUE, 0); Disable(TRUE, 0);
((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::Area::e_jetski); ((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::Area::e_jetski);
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE);

2
LEGO1/lego/legoomni/src/actors/motorcycle.cpp
View File

@ -88,7 +88,7 @@ MxLong Motocycle::HandleClick()
return 1; return 1;
} }
FUN_10015820(TRUE, 0); Disable(TRUE, 0);
((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::Area::e_motocycle); ((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::Area::e_motocycle);
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE);

2
LEGO1/lego/legoomni/src/actors/skateboard.cpp
View File

@ -79,7 +79,7 @@ MxLong SkateBoard::HandleClick()
return 1; return 1;
} }
FUN_10015820(TRUE, 0); Disable(TRUE, 0);
((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::Area::e_skateboard); ((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::Area::e_skateboard);
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE);

2
LEGO1/lego/legoomni/src/actors/towtrack.cpp
View File

@ -411,7 +411,7 @@ MxLong TowTrack::HandleClick()
return 1; return 1;
} }
FUN_10015820(TRUE, 0); Disable(TRUE, 0);
((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::e_towtrack); ((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::e_towtrack);
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);

2
LEGO1/lego/legoomni/src/build/legocarbuild.cpp
View File

@ -1253,7 +1253,7 @@ void LegoCarBuild::FUN_10024ef0()
m_buildState->m_animationState = LegoVehicleBuildState::e_cutscene; m_buildState->m_animationState = LegoVehicleBuildState::e_cutscene;
FUN_10025720(FUN_10025d70()); FUN_10025720(FUN_10025d70());
m_buildState->m_unk0x4c += 1; m_buildState->m_unk0x4c += 1;
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }
// FUNCTION: LEGO1 0x10024f30 // FUNCTION: LEGO1 0x10024f30

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

@ -851,7 +851,7 @@ void LegoGameState::SwitchArea(Area p_area)
m_previousArea = m_currentArea; m_previousArea = m_currentArea;
m_currentArea = p_area; m_currentArea = p_area;
FUN_10015820(TRUE, LegoOmni::c_disableInput | LegoOmni::c_disable3d); Disable(TRUE, LegoOmni::c_disableInput | LegoOmni::c_disable3d);
BackgroundAudioManager()->Stop(); BackgroundAudioManager()->Stop();
AnimationManager()->Suspend(); AnimationManager()->Suspend();
VideoManager()->SetUnk0x554(FALSE); VideoManager()->SetUnk0x554(FALSE);

4
LEGO1/lego/legoomni/src/common/misc.cpp
View File

@ -140,10 +140,10 @@ ViewLODListManager* GetViewLODListManager()
// FUNCTION: LEGO1 0x10015820 // FUNCTION: LEGO1 0x10015820
// FUNCTION: BETA10 0x100e4c92 // FUNCTION: BETA10 0x100e4c92
void FUN_10015820(MxBool p_disable, MxU16 p_flags) void Disable(MxBool p_disable, MxU16 p_flags)
{ {
assert(LegoOmni::GetInstance()); assert(LegoOmni::GetInstance());
LegoOmni::GetInstance()->FUN_1005b4f0(p_disable, p_flags); LegoOmni::GetInstance()->Disable(p_disable, p_flags);
} }
// FUNCTION: LEGO1 0x10015840 // FUNCTION: LEGO1 0x10015840

2
LEGO1/lego/legoomni/src/entity/legoworldpresenter.cpp
View File

@ -62,7 +62,7 @@ LegoWorldPresenter::~LegoWorldPresenter()
} }
if (result == FALSE) { if (result == FALSE) {
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }
if (m_entity) { if (m_entity) {

2
LEGO1/lego/legoomni/src/main/legomain.cpp
View File

@ -518,7 +518,7 @@ LegoOmni::World LegoOmni::GetWorldId(const char* p_key)
} }
// FUNCTION: LEGO1 0x1005b4f0 // FUNCTION: LEGO1 0x1005b4f0
void LegoOmni::FUN_1005b4f0(MxBool p_disable, MxU16 p_flags) void LegoOmni::Disable(MxBool p_disable, MxU16 p_flags)
{ {
if (p_disable) { if (p_disable) {
if (p_flags & c_disableInput) { if (p_flags & c_disableInput) {

2
LEGO1/lego/legoomni/src/race/carrace.cpp
View File

@ -124,7 +124,7 @@ void CarRace::ReadyWorld()
BackgroundAudioManager()->PlayMusic(action, 5, MxPresenter::e_repeating); BackgroundAudioManager()->PlayMusic(action, 5, MxPresenter::e_repeating);
AnimationManager()->Resume(); AnimationManager()->Resume();
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
m_unk0x144 = g_unk0x100d5d10[rand() & 7]; m_unk0x144 = g_unk0x100d5d10[rand() & 7];

2
LEGO1/lego/legoomni/src/race/jetskirace.cpp
View File

@ -95,7 +95,7 @@ void JetskiRace::ReadyWorld()
m_unk0x12c = (MxStillPresenter*) Find("MxPresenter", "JetskiLocator3"); m_unk0x12c = (MxStillPresenter*) Find("MxPresenter", "JetskiLocator3");
m_unk0x12c->SetPosition(m_unk0x130.GetLeft(), m_unk0x130.GetTop()); m_unk0x12c->SetPosition(m_unk0x130.GetLeft(), m_unk0x130.GetTop());
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
VariableTable()->SetVariable("DISTANCE", "0.036"); VariableTable()->SetVariable("DISTANCE", "0.036");

8
LEGO1/lego/legoomni/src/worlds/act3.cpp
View File

@ -552,7 +552,7 @@ MxLong Act3::Notify(MxParam& p_param)
if (param.GetAction() != NULL && param.GetAction()->GetAtomId() == *g_act3Script) { if (param.GetAction() != NULL && param.GetAction()->GetAtomId() == *g_act3Script) {
if (param.GetAction()->GetObjectId() == Act3Script::c_HelicopterDashboard) { if (param.GetAction()->GetObjectId() == Act3Script::c_HelicopterDashboard) {
MxDSAction action; MxDSAction action;
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
SetAppCursor(e_cursorArrow); SetAppCursor(e_cursorArrow);
VideoManager()->Get3DManager()->SetFrustrum(45.0f, 0.1f, 125.0f); VideoManager()->Get3DManager()->SetFrustrum(45.0f, 0.1f, 125.0f);
@ -634,7 +634,7 @@ MxLong Act3::Notify(MxParam& p_param)
assert(m_copter && m_brickster && m_cop1 && m_cop2); assert(m_copter && m_brickster && m_cop1 && m_cop2);
m_unk0x4220.FUN_100720d0(0); m_unk0x4220.FUN_100720d0(0);
m_state->m_unk0x08 = 0; m_state->m_unk0x08 = 0;
FUN_10015820(TRUE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(TRUE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
m_copter->HandleClick(); m_copter->HandleClick();
m_copter->m_state->m_unk0x08 = 1; m_copter->m_state->m_unk0x08 = 1;
m_copter->HandleEndAnim((LegoEndAnimNotificationParam&) param); m_copter->HandleEndAnim((LegoEndAnimNotificationParam&) param);
@ -685,7 +685,7 @@ MxResult Act3::Tickle()
if (m_unk0x426c != (Act3Script::Script) 0) { if (m_unk0x426c != (Act3Script::Script) 0) {
if (AnimationManager()->FUN_10064ee0(m_unk0x426c)) { if (AnimationManager()->FUN_10064ee0(m_unk0x426c)) {
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
TickleManager()->UnregisterClient(this); TickleManager()->UnregisterClient(this);
m_unk0x426c = (Act3Script::Script) 0; m_unk0x426c = (Act3Script::Script) 0;
} }
@ -880,7 +880,7 @@ void Act3::Enable(MxBool p_enable)
GameState()->StopArea(LegoGameState::e_infomain); GameState()->StopArea(LegoGameState::e_infomain);
} }
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
PlayMusic(JukeboxScript::c_Act3Music); PlayMusic(JukeboxScript::c_Act3Music);
GameState()->m_isDirty = TRUE; GameState()->m_isDirty = TRUE;

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

@ -79,7 +79,7 @@ void ElevatorBottom::ReadyWorld()
{ {
LegoWorld::ReadyWorld(); LegoWorld::ReadyWorld();
PlayMusic(JukeboxScript::c_InformationCenter_Music); PlayMusic(JukeboxScript::c_InformationCenter_Music);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }
// FUNCTION: LEGO1 0x100181d0 // FUNCTION: LEGO1 0x100181d0

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

@ -265,7 +265,7 @@ void GasStation::ReadyWorld()
break; break;
} }
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }
// FUNCTION: LEGO1 0x10005590 // FUNCTION: LEGO1 0x10005590

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

@ -214,7 +214,7 @@ void Hospital::ReadyWorld()
m_setWithCurrentAction = 1; m_setWithCurrentAction = 1;
} }
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }
// FUNCTION: LEGO1 0x10074dd0 // FUNCTION: LEGO1 0x10074dd0

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

@ -465,7 +465,7 @@ void Infocenter::ReadyWorld()
PlayAction(InfomainScript::c_iicx18in_RunAnim); PlayAction(InfomainScript::c_iicx18in_RunAnim);
PlayMusic(JukeboxScript::c_InformationCenter_Music); PlayMusic(JukeboxScript::c_InformationCenter_Music);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
return; return;
case 5: case 5:
default: { default: {
@ -478,7 +478,7 @@ void Infocenter::ReadyWorld()
m_bigInfoBlinkTimer = 1; m_bigInfoBlinkTimer = 1;
} }
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
if (!m_infocenterState->HasRegistered()) { if (!m_infocenterState->HasRegistered()) {
m_bookAnimationTimer = 1; m_bookAnimationTimer = 1;
@ -489,7 +489,7 @@ void Infocenter::ReadyWorld()
case 8: case 8:
PlayMusic(JukeboxScript::c_InformationCenter_Music); PlayMusic(JukeboxScript::c_InformationCenter_Music);
PlayAction(InfomainScript::c_iic043in_RunAnim); PlayAction(InfomainScript::c_iic043in_RunAnim);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
return; return;
case 0xf: case 0xf:
m_infocenterState->m_unk0x74 = 2; m_infocenterState->m_unk0x74 = 2;
@ -499,7 +499,7 @@ void Infocenter::ReadyWorld()
PlayAction(InfomainScript::c_iicx17in_RunAnim); PlayAction(InfomainScript::c_iicx17in_RunAnim);
PlayMusic(JukeboxScript::c_InformationCenter_Music); PlayMusic(JukeboxScript::c_InformationCenter_Music);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
return; return;
} }
break; break;
@ -508,7 +508,7 @@ void Infocenter::ReadyWorld()
PlayMusic(JukeboxScript::c_InformationCenter_Music); PlayMusic(JukeboxScript::c_InformationCenter_Music);
bgRed->Enable(TRUE); bgRed->Enable(TRUE);
PlayAction(InfomainScript::c_iic043in_RunAnim); PlayAction(InfomainScript::c_iic043in_RunAnim);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
return; return;
} }
@ -538,7 +538,7 @@ void Infocenter::ReadyWorld()
PlayAction(script); PlayAction(script);
InputManager()->DisableInputProcessing(); InputManager()->DisableInputProcessing();
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
return; return;
} }
@ -553,7 +553,7 @@ void Infocenter::ReadyWorld()
PlayMusic(JukeboxScript::c_InformationCenter_Music); PlayMusic(JukeboxScript::c_InformationCenter_Music);
bgRed->Enable(TRUE); bgRed->Enable(TRUE);
PlayAction(InfomainScript::c_iic043in_RunAnim); PlayAction(InfomainScript::c_iic043in_RunAnim);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
return; return;
} }
@ -590,7 +590,7 @@ void Infocenter::ReadyWorld()
PlayAction(script); PlayAction(script);
InputManager()->DisableInputProcessing(); InputManager()->DisableInputProcessing();
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
return; return;
} }
@ -603,7 +603,7 @@ void Infocenter::ReadyWorld()
} }
m_infocenterState->m_unk0x74 = 11; m_infocenterState->m_unk0x74 = 11;
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }
// FUNCTION: LEGO1 0x1006f9a0 // FUNCTION: LEGO1 0x1006f9a0
@ -1284,7 +1284,7 @@ void Infocenter::StopCutscene()
VideoManager()->EnableFullScreenMovie(FALSE); VideoManager()->EnableFullScreenMovie(FALSE);
InputManager()->SetUnknown335(FALSE); InputManager()->SetUnknown335(FALSE);
SetAppCursor(e_cursorArrow); SetAppCursor(e_cursorArrow);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }
// FUNCTION: LEGO1 0x10070d00 // FUNCTION: LEGO1 0x10070d00

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

@ -88,7 +88,7 @@ void InfocenterDoor::ReadyWorld()
{ {
LegoWorld::ReadyWorld(); LegoWorld::ReadyWorld();
PlayMusic(JukeboxScript::c_InformationCenter_Music); PlayMusic(JukeboxScript::c_InformationCenter_Music);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }
// FUNCTION: LEGO1 0x10037a90 // FUNCTION: LEGO1 0x10037a90

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

@ -277,7 +277,7 @@ void Isle::ReadyWorld()
EnableAnimations(TRUE); EnableAnimations(TRUE);
FUN_10032620(); FUN_10032620();
m_act1state->PlaceActors(); m_act1state->PlaceActors();
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }
} }
@ -839,7 +839,7 @@ void Isle::Enable(MxBool p_enable)
(m_act1state->m_unk0x018 != 0 || GameState()->m_currentArea != LegoGameState::e_jetski) && (m_act1state->m_unk0x018 != 0 || GameState()->m_currentArea != LegoGameState::e_jetski) &&
(m_act1state->m_unk0x018 != 0 || GameState()->m_currentArea != LegoGameState::e_skateboard) && (m_act1state->m_unk0x018 != 0 || GameState()->m_currentArea != LegoGameState::e_skateboard) &&
(m_act1state->m_unk0x018 != 0 || GameState()->m_currentArea != LegoGameState::e_jetrace2)) { (m_act1state->m_unk0x018 != 0 || GameState()->m_currentArea != LegoGameState::e_jetrace2)) {
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }
SetROIVisible("stretch", FALSE); SetROIVisible("stretch", FALSE);
@ -961,7 +961,7 @@ MxLong Isle::HandleTransitionEnd()
m_destLocation = LegoGameState::e_undefined; m_destLocation = LegoGameState::e_undefined;
VariableTable()->SetVariable("VISIBILITY", "Show Gas"); VariableTable()->SetVariable("VISIBILITY", "Show Gas");
AnimationManager()->Resume(); AnimationManager()->Resume();
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
SetAppCursor(e_cursorArrow); SetAppCursor(e_cursorArrow);
SetIsWorldActive(TRUE); SetIsWorldActive(TRUE);
break; break;
@ -971,7 +971,7 @@ MxLong Isle::HandleTransitionEnd()
m_destLocation = LegoGameState::e_undefined; m_destLocation = LegoGameState::e_undefined;
VariableTable()->SetVariable("VISIBILITY", "Show Policsta"); VariableTable()->SetVariable("VISIBILITY", "Show Policsta");
AnimationManager()->Resume(); AnimationManager()->Resume();
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
SetAppCursor(e_cursorArrow); SetAppCursor(e_cursorArrow);
SetIsWorldActive(TRUE); SetIsWorldActive(TRUE);
break; break;
@ -1082,7 +1082,7 @@ void Isle::FUN_10032d30(
VariableTable()->SetVariable(g_varCAMERALOCATION, p_cameraLocation); VariableTable()->SetVariable(g_varCAMERALOCATION, p_cameraLocation);
} }
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
SetAppCursor(e_cursorArrow); SetAppCursor(e_cursorArrow);
m_destLocation = LegoGameState::e_undefined; m_destLocation = LegoGameState::e_undefined;
m_act1state->m_unk0x01f = FALSE; m_act1state->m_unk0x01f = FALSE;

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

@ -247,7 +247,7 @@ MxResult JukeBox::Tickle()
if (m_unk0x100 == 1) { if (m_unk0x100 == 1) {
m_unk0x100 = 0; m_unk0x100 = 0;
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }
return SUCCESS; return SUCCESS;

6
LEGO1/lego/legoomni/src/worlds/legoact2.cpp
View File

@ -192,7 +192,7 @@ MxResult LegoAct2::Tickle()
case 2: case 2:
if (g_unk0x100f4474) { if (g_unk0x100f4474) {
if (AnimationManager()->FUN_10064ee0(g_unk0x100f4474)) { if (AnimationManager()->FUN_10064ee0(g_unk0x100f4474)) {
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
g_unk0x100f4474 = (Act2mainScript::Script) 0; g_unk0x100f4474 = (Act2mainScript::Script) 0;
} }
} }
@ -200,7 +200,7 @@ MxResult LegoAct2::Tickle()
m_unk0x10d0 += 50; m_unk0x10d0 += 50;
break; break;
case 3: case 3:
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
m_unk0x10d0 = 0; m_unk0x10d0 = 0;
m_unk0x10c4 = 4; m_unk0x10c4 = 4;
FUN_10052560(Act2mainScript::c_tja009ni_RunAnim, TRUE, TRUE, NULL, NULL, NULL); FUN_10052560(Act2mainScript::c_tja009ni_RunAnim, TRUE, TRUE, NULL, NULL, NULL);
@ -540,7 +540,7 @@ void LegoAct2::Enable(MxBool p_enable)
GameState()->StopArea(LegoGameState::e_infomain); GameState()->StopArea(LegoGameState::e_infomain);
} }
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
if (m_unk0x10c4 != 6 && m_unk0x10c4 != 12) { if (m_unk0x10c4 != 6 && m_unk0x10c4 != 12) {
PlayMusic(m_music); PlayMusic(m_music);

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

@ -95,7 +95,7 @@ void Police::ReadyWorld()
{ {
LegoWorld::ReadyWorld(); LegoWorld::ReadyWorld();
PlayMusic(JukeboxScript::c_PoliceStation_Music); PlayMusic(JukeboxScript::c_PoliceStation_Music);
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }
// FUNCTION: LEGO1 0x1005e550 // FUNCTION: LEGO1 0x1005e550

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

@ -159,7 +159,7 @@ void Score::ReadyWorld()
PlayMusic(JukeboxScript::c_InformationCenter_Music); PlayMusic(JukeboxScript::c_InformationCenter_Music);
} }
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); Disable(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
} }
// FUNCTION: LEGO1 0x100016d0 // FUNCTION: LEGO1 0x100016d0