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

Misc name changes in Hospital

Browse Source
This commit is contained in:
Fabian Neundorf 2025-06-07 17:31:06 +02:00
parent c092a49424
commit ae3c2778e5
2 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LEGO1/lego/legoomni/include/hospital.h
View File

@ -95,9 +95,9 @@ class Hospital : public LegoWorld {
MxS16 m_currentActorId; // 0xf8 MxS16 m_currentActorId; // 0xf8
LegoGameState::Area m_destLocation; // 0xfc LegoGameState::Area m_destLocation; // 0xfc
undefined2 m_unk0x100; // 0x100 MxU16 m_interactionMode; // 0x100
HospitalState* m_hospitalState; // 0x104 HospitalState* m_hospitalState; // 0x104
undefined2 m_unk0x108; // 0x108 MxU16 m_setWithCurrentAction; // 0x108
HospitalScript::Script m_currentAction; // 0x10c HospitalScript::Script m_currentAction; // 0x10c
MxStillPresenter* m_copLedBitmap; // 0x110 MxStillPresenter* m_copLedBitmap; // 0x110
MxStillPresenter* m_pizzaLedBitmap; // 0x114 MxStillPresenter* m_pizzaLedBitmap; // 0x114

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

@ -24,7 +24,7 @@ DECOMP_SIZE_ASSERT(Hospital, 0x12c)
DECOMP_SIZE_ASSERT(HospitalState, 0x18) DECOMP_SIZE_ASSERT(HospitalState, 0x18)
// GLOBAL: LEGO1 0x100f7918 // GLOBAL: LEGO1 0x100f7918
undefined4 g_unk0x100f7918 = 3; undefined4 g_animationSkipCounter = 3;
// GLOBAL: LEGO1 0x100f791c // GLOBAL: LEGO1 0x100f791c
MxBool g_copLedEnabled = FALSE; MxBool g_copLedEnabled = FALSE;
@ -36,9 +36,9 @@ MxBool g_pizzaLedEnabled = FALSE;
Hospital::Hospital() Hospital::Hospital()
{ {
m_currentActorId = LegoActor::c_none; m_currentActorId = LegoActor::c_none;
m_unk0x100 = 0; m_interactionMode = 0;
m_hospitalState = NULL; m_hospitalState = NULL;
m_unk0x108 = 0; m_setWithCurrentAction = 0;
m_destLocation = LegoGameState::e_undefined; m_destLocation = LegoGameState::e_undefined;
m_currentAction = HospitalScript::c__StartUp; m_currentAction = HospitalScript::c__StartUp;
m_copLedBitmap = NULL; m_copLedBitmap = NULL;
@ -64,7 +64,7 @@ Hospital::~Hospital()
m_hospitalState->m_state = 3; m_hospitalState->m_state = 3;
NotificationManager()->Unregister(this); NotificationManager()->Unregister(this);
g_unk0x100f7918 = 3; g_animationSkipCounter = 3;
} }
// FUNCTION: LEGO1 0x100748c0 // FUNCTION: LEGO1 0x100748c0
@ -201,17 +201,17 @@ void Hospital::ReadyWorld()
PlayAction(hospitalScript[m_hospitalState->m_stateActor]); PlayAction(hospitalScript[m_hospitalState->m_stateActor]);
m_currentAction = hospitalScript[m_hospitalState->m_stateActor]; m_currentAction = hospitalScript[m_hospitalState->m_stateActor];
m_unk0x108 = 1; m_setWithCurrentAction = 1;
} }
else { else {
m_unk0x100 = 1; m_interactionMode = 1;
m_time = Timer()->GetTime(); m_time = Timer()->GetTime();
m_hospitalState->m_state = 6; m_hospitalState->m_state = 6;
PlayAction(HospitalScript::c_hho003cl_RunAnim); PlayAction(HospitalScript::c_hho003cl_RunAnim);
m_currentAction = HospitalScript::c_hho003cl_RunAnim; m_currentAction = HospitalScript::c_hho003cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
} }
FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen); FUN_10015820(FALSE, LegoOmni::c_disableInput | LegoOmni::c_disable3d | LegoOmni::c_clearScreen);
@ -222,7 +222,7 @@ MxLong Hospital::HandleKeyPress(MxS8 p_key)
{ {
MxLong result = 0; MxLong result = 0;
if (p_key == VK_SPACE && g_unk0x100f7918 == 0) { if (p_key == VK_SPACE && g_animationSkipCounter == 0) {
DeleteObjects(&m_atomId, HospitalScript::c_hho002cl_RunAnim, HospitalScript::c_hho006cl_RunAnim); DeleteObjects(&m_atomId, HospitalScript::c_hho002cl_RunAnim, HospitalScript::c_hho006cl_RunAnim);
result = 1; result = 1;
} }
@ -241,7 +241,7 @@ MxLong Hospital::HandleEndAction(MxEndActionNotificationParam& p_param)
return result; return result;
} }
m_unk0x108 = 0; m_setWithCurrentAction = 0;
switch (m_hospitalState->m_state) { switch (m_hospitalState->m_state) {
case 5: case 5:
@ -249,18 +249,18 @@ MxLong Hospital::HandleEndAction(MxEndActionNotificationParam& p_param)
PlayAction(HospitalScript::c_hho006cl_RunAnim); PlayAction(HospitalScript::c_hho006cl_RunAnim);
m_currentAction = HospitalScript::c_hho006cl_RunAnim; m_currentAction = HospitalScript::c_hho006cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
m_flashingLeds = 1; m_flashingLeds = 1;
g_unk0x100f7918 = 0; g_animationSkipCounter = 0;
break; break;
case 6: case 6:
m_time = Timer()->GetTime(); m_time = Timer()->GetTime();
m_unk0x100 = 1; m_interactionMode = 1;
break; break;
case 7: case 7:
case 10: case 10:
m_hospitalState->m_state = 8; m_hospitalState->m_state = 8;
m_unk0x100 = 1; m_interactionMode = 1;
m_time = Timer()->GetTime(); m_time = Timer()->GetTime();
break; break;
case 11: case 11:
@ -273,14 +273,14 @@ MxLong Hospital::HandleEndAction(MxEndActionNotificationParam& p_param)
PlayAction(HospitalScript::c_hho017cl_RunAnim); PlayAction(HospitalScript::c_hho017cl_RunAnim);
m_currentAction = HospitalScript::c_hho017cl_RunAnim; m_currentAction = HospitalScript::c_hho017cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
default: default:
m_hospitalState->m_state = 12; m_hospitalState->m_state = 12;
PlayAction(HospitalScript::c_hho018cl_RunAnim); PlayAction(HospitalScript::c_hho018cl_RunAnim);
m_currentAction = HospitalScript::c_hho018cl_RunAnim; m_currentAction = HospitalScript::c_hho018cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
} }
break; break;
@ -292,14 +292,14 @@ MxLong Hospital::HandleEndAction(MxEndActionNotificationParam& p_param)
PlayAction(HospitalScript::c_hho019cl_RunAnim); PlayAction(HospitalScript::c_hho019cl_RunAnim);
m_currentAction = HospitalScript::c_hho019cl_RunAnim; m_currentAction = HospitalScript::c_hho019cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
default: default:
m_hospitalState->m_state = 12; m_hospitalState->m_state = 12;
PlayAction(HospitalScript::c_hho020cl_RunAnim); PlayAction(HospitalScript::c_hho020cl_RunAnim);
m_currentAction = HospitalScript::c_hho020cl_RunAnim; m_currentAction = HospitalScript::c_hho020cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
} }
break; break;
@ -311,14 +311,14 @@ MxLong Hospital::HandleEndAction(MxEndActionNotificationParam& p_param)
PlayAction(HospitalScript::c_hho023cl_RunAnim); PlayAction(HospitalScript::c_hho023cl_RunAnim);
m_currentAction = HospitalScript::c_hho023cl_RunAnim; m_currentAction = HospitalScript::c_hho023cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
default: default:
m_hospitalState->m_state = 12; m_hospitalState->m_state = 12;
PlayAction(HospitalScript::c_hho024cl_RunAnim); PlayAction(HospitalScript::c_hho024cl_RunAnim);
m_currentAction = HospitalScript::c_hho024cl_RunAnim; m_currentAction = HospitalScript::c_hho024cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
} }
break; break;
@ -330,14 +330,14 @@ MxLong Hospital::HandleEndAction(MxEndActionNotificationParam& p_param)
PlayAction(HospitalScript::c_hho021cl_RunAnim); PlayAction(HospitalScript::c_hho021cl_RunAnim);
m_currentAction = HospitalScript::c_hho021cl_RunAnim; m_currentAction = HospitalScript::c_hho021cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
default: default:
m_hospitalState->m_state = 12; m_hospitalState->m_state = 12;
PlayAction(HospitalScript::c_hhoa22cl_RunAnim); PlayAction(HospitalScript::c_hhoa22cl_RunAnim);
m_currentAction = HospitalScript::c_hhoa22cl_RunAnim; m_currentAction = HospitalScript::c_hhoa22cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
} }
break; break;
@ -349,14 +349,14 @@ MxLong Hospital::HandleEndAction(MxEndActionNotificationParam& p_param)
PlayAction(HospitalScript::c_hho025cl_RunAnim); PlayAction(HospitalScript::c_hho025cl_RunAnim);
m_currentAction = HospitalScript::c_hho025cl_RunAnim; m_currentAction = HospitalScript::c_hho025cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
default: default:
m_hospitalState->m_state = 12; m_hospitalState->m_state = 12;
PlayAction(HospitalScript::c_hho026cl_RunAnim); PlayAction(HospitalScript::c_hho026cl_RunAnim);
m_currentAction = HospitalScript::c_hho026cl_RunAnim; m_currentAction = HospitalScript::c_hho026cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
} }
break; break;
@ -395,7 +395,7 @@ MxLong Hospital::HandleEndAction(MxEndActionNotificationParam& p_param)
// FUNCTION: BETA10 0x1002d2b1 // FUNCTION: BETA10 0x1002d2b1
MxLong Hospital::HandleButtonDown(LegoControlManagerNotificationParam& p_param) MxLong Hospital::HandleButtonDown(LegoControlManagerNotificationParam& p_param)
{ {
if (m_unk0x100 == 1) { if (m_interactionMode == 1) {
LegoROI* roi = PickROI(p_param.GetX(), p_param.GetY()); LegoROI* roi = PickROI(p_param.GetX(), p_param.GetY());
if (roi != NULL) { if (roi != NULL) {
const LegoChar* roiName = roi->GetName(); const LegoChar* roiName = roi->GetName();
@ -407,7 +407,7 @@ MxLong Hospital::HandleButtonDown(LegoControlManagerNotificationParam& p_param)
if (!strcmpi("actor_ha", roiName)) { if (!strcmpi("actor_ha", roiName)) {
InputManager()->DisableInputProcessing(); InputManager()->DisableInputProcessing();
m_unk0x100 = 3; m_interactionMode = 3;
if (m_hospitalState->m_state == 6) { if (m_hospitalState->m_state == 6) {
if (m_unk0x128 == 0) { if (m_unk0x128 == 0) {
@ -451,14 +451,14 @@ MxLong Hospital::HandleButtonDown(LegoControlManagerNotificationParam& p_param)
PlayAction(HospitalScript::c_hho017cl_RunAnim); PlayAction(HospitalScript::c_hho017cl_RunAnim);
m_currentAction = HospitalScript::c_hho017cl_RunAnim; m_currentAction = HospitalScript::c_hho017cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
default: default:
m_hospitalState->m_state = 12; m_hospitalState->m_state = 12;
PlayAction(HospitalScript::c_hho018cl_RunAnim); PlayAction(HospitalScript::c_hho018cl_RunAnim);
m_currentAction = HospitalScript::c_hho018cl_RunAnim; m_currentAction = HospitalScript::c_hho018cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
} }
break; break;
@ -470,14 +470,14 @@ MxLong Hospital::HandleButtonDown(LegoControlManagerNotificationParam& p_param)
PlayAction(HospitalScript::c_hho019cl_RunAnim); PlayAction(HospitalScript::c_hho019cl_RunAnim);
m_currentAction = HospitalScript::c_hho019cl_RunAnim; m_currentAction = HospitalScript::c_hho019cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
default: default:
m_hospitalState->m_state = 12; m_hospitalState->m_state = 12;
PlayAction(HospitalScript::c_hho020cl_RunAnim); PlayAction(HospitalScript::c_hho020cl_RunAnim);
m_currentAction = HospitalScript::c_hho020cl_RunAnim; m_currentAction = HospitalScript::c_hho020cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
} }
break; break;
@ -489,14 +489,14 @@ MxLong Hospital::HandleButtonDown(LegoControlManagerNotificationParam& p_param)
PlayAction(HospitalScript::c_hho021cl_RunAnim); PlayAction(HospitalScript::c_hho021cl_RunAnim);
m_currentAction = HospitalScript::c_hho021cl_RunAnim; m_currentAction = HospitalScript::c_hho021cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
default: default:
m_hospitalState->m_state = 12; m_hospitalState->m_state = 12;
PlayAction(HospitalScript::c_hhoa22cl_RunAnim); PlayAction(HospitalScript::c_hhoa22cl_RunAnim);
m_currentAction = HospitalScript::c_hhoa22cl_RunAnim; m_currentAction = HospitalScript::c_hhoa22cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
} }
break; break;
@ -508,14 +508,14 @@ MxLong Hospital::HandleButtonDown(LegoControlManagerNotificationParam& p_param)
PlayAction(HospitalScript::c_hho023cl_RunAnim); PlayAction(HospitalScript::c_hho023cl_RunAnim);
m_currentAction = HospitalScript::c_hho023cl_RunAnim; m_currentAction = HospitalScript::c_hho023cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
default: default:
m_hospitalState->m_state = 12; m_hospitalState->m_state = 12;
PlayAction(HospitalScript::c_hho024cl_RunAnim); PlayAction(HospitalScript::c_hho024cl_RunAnim);
m_currentAction = HospitalScript::c_hho024cl_RunAnim; m_currentAction = HospitalScript::c_hho024cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
} }
break; break;
@ -527,14 +527,14 @@ MxLong Hospital::HandleButtonDown(LegoControlManagerNotificationParam& p_param)
PlayAction(HospitalScript::c_hho025cl_RunAnim); PlayAction(HospitalScript::c_hho025cl_RunAnim);
m_currentAction = HospitalScript::c_hho025cl_RunAnim; m_currentAction = HospitalScript::c_hho025cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
default: default:
m_hospitalState->m_state = 12; m_hospitalState->m_state = 12;
PlayAction(HospitalScript::c_hho026cl_RunAnim); PlayAction(HospitalScript::c_hho026cl_RunAnim);
m_currentAction = HospitalScript::c_hho026cl_RunAnim; m_currentAction = HospitalScript::c_hho026cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
break; break;
} }
break; break;
@ -559,12 +559,12 @@ MxBool Hospital::HandleControl(LegoControlManagerNotificationParam& p_param)
BackgroundAudioManager()->RaiseVolume(); BackgroundAudioManager()->RaiseVolume();
DeleteObjects(&m_atomId, HospitalScript::c_hho002cl_RunAnim, HospitalScript::c_hho006cl_RunAnim); DeleteObjects(&m_atomId, HospitalScript::c_hho002cl_RunAnim, HospitalScript::c_hho006cl_RunAnim);
if (m_unk0x100 == 1) { if (m_interactionMode == 1) {
m_hospitalState->m_state = 14; m_hospitalState->m_state = 14;
PlayAction(HospitalScript::c_hho016cl_RunAnim); PlayAction(HospitalScript::c_hho016cl_RunAnim);
m_currentAction = HospitalScript::c_hho016cl_RunAnim; m_currentAction = HospitalScript::c_hho016cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
} }
else if (m_unk0x128 == 0) { else if (m_unk0x128 == 0) {
m_unk0x128 = 1; m_unk0x128 = 1;
@ -580,12 +580,12 @@ MxBool Hospital::HandleControl(LegoControlManagerNotificationParam& p_param)
case HospitalScript::c_Door_Ctl: case HospitalScript::c_Door_Ctl:
DeleteObjects(&m_atomId, HospitalScript::c_hho002cl_RunAnim, HospitalScript::c_hho006cl_RunAnim); DeleteObjects(&m_atomId, HospitalScript::c_hho002cl_RunAnim, HospitalScript::c_hho006cl_RunAnim);
if (m_unk0x100 == 1) { if (m_interactionMode == 1) {
m_hospitalState->m_state = 15; m_hospitalState->m_state = 15;
PlayAction(HospitalScript::c_hho016cl_RunAnim); PlayAction(HospitalScript::c_hho016cl_RunAnim);
m_currentAction = HospitalScript::c_hho016cl_RunAnim; m_currentAction = HospitalScript::c_hho016cl_RunAnim;
m_unk0x108 = 1; m_setWithCurrentAction = 1;
} }
else if (m_unk0x128 == 0) { else if (m_unk0x128 == 0) {
m_unk0x128 = 1; m_unk0x128 = 1;
@ -637,8 +637,8 @@ MxResult Hospital::Tickle()
return SUCCESS; return SUCCESS;
} }
if (g_unk0x100f7918 != 0) { if (g_animationSkipCounter != 0) {
g_unk0x100f7918 -= 1; g_animationSkipCounter -= 1;
} }
MxLong time = Timer()->GetTime(); MxLong time = Timer()->GetTime();