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

Match

Browse Source
This commit is contained in:
Christian Semmler 2024-03-18 13:20:37 -04:00
parent 2d05f10094
commit 9d110f8b6e
3 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
LEGO1/lego/legoomni/src/act1/act1state.cpp
View File

@ -17,7 +17,7 @@ extern MxAtomId* g_isleScript;
// STUB: LEGO1 0x100334b0 // STUB: LEGO1 0x100334b0
Act1State::Act1State() : m_unk0x00c(0), m_unk0x00e(0), m_unk0x008(NULL), m_unk0x010(0) Act1State::Act1State() : m_unk0x00c(0), m_unk0x00e(0), m_unk0x008(NULL), m_unk0x010(0)
{ {
m_unk0x01e = 0; m_unk0x01e = FALSE;
m_unk0x018 = 1; m_unk0x018 = 1;
m_unk0x010 = 0; m_unk0x010 = 0;
m_planeActive = FALSE; m_planeActive = FALSE;

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

@ -193,23 +193,26 @@ MxLong Isle::HandleEndAction(MxEndActionNotificationParam& p_param)
if (result == 0) { if (result == 0) {
MxDSAction* action = p_param.GetAction(); MxDSAction* action = p_param.GetAction();
// TODO: Should be signed, but worsens match
MxU32 script;
if (action->GetAtomId() == *g_jukeboxScript) { if (action->GetAtomId() == *g_jukeboxScript) {
JukeboxScript::Script script = (JukeboxScript::Script) action->GetObjectId(); script = action->GetObjectId();
if (script >= JukeboxScript::c_JBMusic1 && script <= JukeboxScript::c_JBMusic6) { if (script >= JukeboxScript::c_JBMusic1 && script <= JukeboxScript::c_JBMusic6) {
m_jukebox->StopAction(script); m_jukebox->StopAction((JukeboxScript::Script) script);
result = 1; result = 1;
} }
} }
else if (m_act1state->m_planeActive) { else if (m_act1state->m_planeActive) {
IsleScript::Script script = (IsleScript::Script) action->GetObjectId(); script = action->GetObjectId();
if (script >= IsleScript::c_nic002pr_RunAnim && script <= IsleScript::c_nic004pr_RunAnim) { if (script >= IsleScript::c_nic002pr_RunAnim && script <= IsleScript::c_nic004pr_RunAnim) {
m_act1state->m_planeActive = FALSE; m_act1state->m_planeActive = FALSE;
} }
} }
else { else {
IsleScript::Script script = (IsleScript::Script) action->GetObjectId(); script = action->GetObjectId();
if (script == IsleScript::c_Avo917In_PlayWav || if (script == IsleScript::c_Avo917In_PlayWav ||
(script >= IsleScript::c_Avo900Ps_PlayWav && script <= IsleScript::c_Avo907Ps_PlayWav)) { (script >= IsleScript::c_Avo900Ps_PlayWav && script <= IsleScript::c_Avo907Ps_PlayWav)) {
@ -222,10 +225,33 @@ MxLong Isle::HandleEndAction(MxEndActionNotificationParam& p_param)
return result; return result;
} }
// STUB: LEGO1 0x10030ef0 // FUNCTION: LEGO1 0x10030ef0
void Isle::HandleElevatorEndAction() void Isle::HandleElevatorEndAction()
{ {
// TODO switch (m_act1state->m_elevFloor) {
case Act1State::c_floor1:
m_destLocation = LegoGameState::e_infomain;
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
m_act1state->m_unk0x018 = 0;
break;
case Act1State::c_floor2:
if (m_act1state->m_unk0x01e) {
m_act1state->m_unk0x01e = FALSE;
m_act1state->m_unk0x018 = 0;
InputManager()->EnableInputProcessing();
}
else {
InvokeAction(Extra::e_start, *g_isleScript, IsleScript::c_Floor2, NULL);
InputManager()->EnableInputProcessing();
m_act1state->m_unk0x01e = TRUE;
}
break;
case Act1State::c_floor3:
m_destLocation = LegoGameState::e_elevopen;
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
m_act1state->m_unk0x018 = 0;
break;
}
} }
// FUNCTION: LEGO1 0x10030fc0 // FUNCTION: LEGO1 0x10030fc0
@ -283,7 +309,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; m_act1state->m_unk0x01e = TRUE;
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);