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

WIP

Browse Source
This commit is contained in:
Christian Semmler 2024-03-18 12:10:42 -04:00
parent eaa99c9d06
commit 2de23b94ad
2 changed files with 159 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,7 +100,7 @@ class Act1State : public LegoState {
undefined m_unk0x012; // 0x012 undefined m_unk0x012; // 0x012
MxS32 m_unk0x014; // 0x014 MxS32 m_unk0x014; // 0x014
MxU32 m_unk0x018; // 0x018 MxU32 m_unk0x018; // 0x018
MxU16 m_elevFloor; // 0x01c MxS16 m_elevFloor; // 0x01c
undefined m_unk0x01e; // 0x01e undefined m_unk0x01e; // 0x01e
MxBool m_unk0x01f; // 0x01f MxBool m_unk0x01f; // 0x01f
MxBool m_planeActive; // 0x020 MxBool m_planeActive; // 0x020

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

@ -194,10 +194,7 @@ void Isle::ReadyWorld()
// FUNCTION: LEGO1 0x10031030 // FUNCTION: LEGO1 0x10031030
MxLong Isle::HandleClick(LegoControlManagerEvent& p_param) MxLong Isle::HandleClick(LegoControlManagerEvent& p_param)
{ {
if (p_param.GetUnknown0x28() != 1) { if (p_param.GetUnknown0x28() == 1) {
return 0;
}
MxDSAction action; MxDSAction action;
switch (p_param.GetClickedObjectId()) { switch (p_param.GetClickedObjectId()) {
@ -231,6 +228,7 @@ MxLong Isle::HandleClick(LegoControlManagerEvent& p_param)
break; break;
case Act1State::c_floor2: case Act1State::c_floor2:
InvokeAction(Extra::e_start, *g_isleScript, IsleScript::c_Floor2, NULL); InvokeAction(Extra::e_start, *g_isleScript, IsleScript::c_Floor2, NULL);
m_act1state->m_unk0x01e = 1;
break; break;
case Act1State::c_floor3: case Act1State::c_floor3:
InvokeAction(Extra::e_start, *g_isleScript, IsleScript::c_Elev3_2_Ride, NULL); InvokeAction(Extra::e_start, *g_isleScript, IsleScript::c_Elev3_2_Ride, NULL);
@ -362,6 +360,7 @@ MxLong Isle::HandleClick(LegoControlManagerEvent& p_param)
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
break; break;
} }
}
return 0; return 0;
} }