isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2024-11-22 15:48:09 -05:00
Code Issues Projects Releases Packages Wiki Activity

label some hospital members (#728)

Browse source
This commit is contained in:
Ramen2X 2024-03-25 11:59:24 -04:00 committed by GitHub
parent d9913ead83
commit 77b5f1338c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 51 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
LEGO1/lego/legoomni/include/hospital.h
View file

@ -49,19 +49,19 @@ class Hospital : public LegoWorld {
MxLong HandleButtonDown(LegoControlManagerEvent& p_param); MxLong HandleButtonDown(LegoControlManagerEvent& p_param);
MxBool HandleClick(LegoControlManagerEvent& p_param); MxBool HandleClick(LegoControlManagerEvent& p_param);
MxS16 m_currentActorId; // 0xf8 MxS16 m_currentActorId; // 0xf8
LegoGameState::Area m_destLocation; // 0xfc LegoGameState::Area m_destLocation; // 0xfc
undefined2 m_unk0x100; // 0x100 undefined2 m_unk0x100; // 0x100
HospitalState* m_hospitalState; // 0x104 HospitalState* m_hospitalState; // 0x104
undefined2 m_unk0x108; // 0x108 undefined2 m_unk0x108; // 0x108
HospitalScript::Script m_unk0x10c; // 0x10c HospitalScript::Script m_currentAction; // 0x10c
MxStillPresenter* m_copLedBitmap; // 0x110 MxStillPresenter* m_copLedBitmap; // 0x110
MxStillPresenter* m_pizzaLedBitmap; // 0x114 MxStillPresenter* m_pizzaLedBitmap; // 0x114
undefined m_unk0x118; // 0x118 undefined m_unk0x118; // 0x118
MxLong m_unk0x11c; // 0x11c MxLong m_copLedAnimTimer; // 0x11c
MxLong m_unk0x120; // 0x120 MxLong m_pizzaLedAnimTimer; // 0x120
MxLong m_time; // 0x124 MxLong m_time; // 0x124
undefined m_unk0x128; // 0x128 undefined m_unk0x128; // 0x128
}; };
#endif // HOSPITAL_H #endif // HOSPITAL_H

76
LEGO1/lego/legoomni/src/worlds/hospital.cpp
View file

@ -23,10 +23,10 @@ DECOMP_SIZE_ASSERT(Hospital, 0x12c)
undefined4 g_unk0x100f7918 = 3; undefined4 g_unk0x100f7918 = 3;
// GLOBAL: LEGO1 0x100f791c // GLOBAL: LEGO1 0x100f791c
undefined g_unk0x100f791c = 0; MxBool g_copLedEnabled = FALSE;
// GLOBAL: LEGO1 0x100f7920 // GLOBAL: LEGO1 0x100f7920
undefined g_unk0x100f7920 = 0; MxBool g_pizzaLedEnabled = FALSE;
// FUNCTION: LEGO1 0x100745e0 // FUNCTION: LEGO1 0x100745e0
Hospital::Hospital() Hospital::Hospital()
@ -36,12 +36,12 @@ Hospital::Hospital()
m_hospitalState = NULL; m_hospitalState = NULL;
m_unk0x108 = 0; m_unk0x108 = 0;
m_destLocation = LegoGameState::e_undefined; m_destLocation = LegoGameState::e_undefined;
m_unk0x10c = HospitalScript::c__StartUp; m_currentAction = HospitalScript::c__StartUp;
m_copLedBitmap = NULL; m_copLedBitmap = NULL;
m_pizzaLedBitmap = NULL; m_pizzaLedBitmap = NULL;
m_unk0x118 = 0; m_unk0x118 = 0;
m_unk0x11c = 0; m_copLedAnimTimer = 0;
m_unk0x120 = 0; m_pizzaLedAnimTimer = 0;
m_unk0x128 = 0; m_unk0x128 = 0;
NotificationManager()->Register(this); NotificationManager()->Register(this);
} }
@ -200,7 +200,7 @@ void Hospital::ReadyWorld()
m_hospitalState->m_unk0x08.m_unk0x00 = 5; m_hospitalState->m_unk0x08.m_unk0x00 = 5;
PlayAction(hospitalScript[m_hospitalState->m_unk0x0c]); PlayAction(hospitalScript[m_hospitalState->m_unk0x0c]);
m_unk0x10c = hospitalScript[m_hospitalState->m_unk0x0c]; m_currentAction = hospitalScript[m_hospitalState->m_unk0x0c];
} }
else { else {
m_unk0x100 = 1; m_unk0x100 = 1;
@ -209,7 +209,7 @@ void Hospital::ReadyWorld()
m_hospitalState->m_unk0x08.m_unk0x00 = 6; m_hospitalState->m_unk0x08.m_unk0x00 = 6;
PlayAction(HospitalScript::c_hho003cl_RunAnim); PlayAction(HospitalScript::c_hho003cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho003cl_RunAnim; m_currentAction = HospitalScript::c_hho003cl_RunAnim;
} }
m_unk0x108 = 1; m_unk0x108 = 1;
@ -248,7 +248,7 @@ MxLong Hospital::HandleEndAction(MxEndActionNotificationParam& p_param)
m_hospitalState->m_unk0x08.m_unk0x00 = 7; m_hospitalState->m_unk0x08.m_unk0x00 = 7;
PlayAction(HospitalScript::c_hho006cl_RunAnim); PlayAction(HospitalScript::c_hho006cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho006cl_RunAnim; m_currentAction = HospitalScript::c_hho006cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
m_unk0x118 = 1; m_unk0x118 = 1;
g_unk0x100f7918 = 0; g_unk0x100f7918 = 0;
@ -272,14 +272,14 @@ MxLong Hospital::HandleEndAction(MxEndActionNotificationParam& p_param)
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hho017cl_RunAnim); PlayAction(HospitalScript::c_hho017cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho017cl_RunAnim; m_currentAction = HospitalScript::c_hho017cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
default: default:
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hho018cl_RunAnim); PlayAction(HospitalScript::c_hho018cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho018cl_RunAnim; m_currentAction = HospitalScript::c_hho018cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
} }
@ -291,14 +291,14 @@ MxLong Hospital::HandleEndAction(MxEndActionNotificationParam& p_param)
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hho019cl_RunAnim); PlayAction(HospitalScript::c_hho019cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho019cl_RunAnim; m_currentAction = HospitalScript::c_hho019cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
default: default:
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hho020cl_RunAnim); PlayAction(HospitalScript::c_hho020cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho020cl_RunAnim; m_currentAction = HospitalScript::c_hho020cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
} }
@ -310,14 +310,14 @@ MxLong Hospital::HandleEndAction(MxEndActionNotificationParam& p_param)
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hho023cl_RunAnim); PlayAction(HospitalScript::c_hho023cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho023cl_RunAnim; m_currentAction = HospitalScript::c_hho023cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
default: default:
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hho024cl_RunAnim); PlayAction(HospitalScript::c_hho024cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho024cl_RunAnim; m_currentAction = HospitalScript::c_hho024cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
} }
@ -329,14 +329,14 @@ MxLong Hospital::HandleEndAction(MxEndActionNotificationParam& p_param)
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hho021cl_RunAnim); PlayAction(HospitalScript::c_hho021cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho021cl_RunAnim; m_currentAction = HospitalScript::c_hho021cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
default: default:
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hhoa22cl_RunAnim); PlayAction(HospitalScript::c_hhoa22cl_RunAnim);
m_unk0x10c = HospitalScript::c_hhoa22cl_RunAnim; m_currentAction = HospitalScript::c_hhoa22cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
} }
@ -348,14 +348,14 @@ MxLong Hospital::HandleEndAction(MxEndActionNotificationParam& p_param)
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hho025cl_RunAnim); PlayAction(HospitalScript::c_hho025cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho025cl_RunAnim; m_currentAction = HospitalScript::c_hho025cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
default: default:
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hho026cl_RunAnim); PlayAction(HospitalScript::c_hho026cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho026cl_RunAnim; m_currentAction = HospitalScript::c_hho026cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
} }
@ -441,14 +441,14 @@ MxLong Hospital::HandleButtonDown(LegoControlManagerEvent& p_param)
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hho017cl_RunAnim); PlayAction(HospitalScript::c_hho017cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho017cl_RunAnim; m_currentAction = HospitalScript::c_hho017cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
default: default:
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hho018cl_RunAnim); PlayAction(HospitalScript::c_hho018cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho018cl_RunAnim; m_currentAction = HospitalScript::c_hho018cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
} }
@ -460,14 +460,14 @@ MxLong Hospital::HandleButtonDown(LegoControlManagerEvent& p_param)
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hho019cl_RunAnim); PlayAction(HospitalScript::c_hho019cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho019cl_RunAnim; m_currentAction = HospitalScript::c_hho019cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
default: default:
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hho020cl_RunAnim); PlayAction(HospitalScript::c_hho020cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho020cl_RunAnim; m_currentAction = HospitalScript::c_hho020cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
} }
@ -479,14 +479,14 @@ MxLong Hospital::HandleButtonDown(LegoControlManagerEvent& p_param)
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hho023cl_RunAnim); PlayAction(HospitalScript::c_hho023cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho023cl_RunAnim; m_currentAction = HospitalScript::c_hho023cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
default: default:
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hho024cl_RunAnim); PlayAction(HospitalScript::c_hho024cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho024cl_RunAnim; m_currentAction = HospitalScript::c_hho024cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
} }
@ -498,14 +498,14 @@ MxLong Hospital::HandleButtonDown(LegoControlManagerEvent& p_param)
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hho021cl_RunAnim); PlayAction(HospitalScript::c_hho021cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho021cl_RunAnim; m_currentAction = HospitalScript::c_hho021cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
default: default:
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hhoa22cl_RunAnim); PlayAction(HospitalScript::c_hhoa22cl_RunAnim);
m_unk0x10c = HospitalScript::c_hhoa22cl_RunAnim; m_currentAction = HospitalScript::c_hhoa22cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
} }
@ -517,14 +517,14 @@ MxLong Hospital::HandleButtonDown(LegoControlManagerEvent& p_param)
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hho025cl_RunAnim); PlayAction(HospitalScript::c_hho025cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho025cl_RunAnim; m_currentAction = HospitalScript::c_hho025cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
default: default:
m_hospitalState->m_unk0x08.m_unk0x00 = 12; m_hospitalState->m_unk0x08.m_unk0x00 = 12;
PlayAction(HospitalScript::c_hho026cl_RunAnim); PlayAction(HospitalScript::c_hho026cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho026cl_RunAnim; m_currentAction = HospitalScript::c_hho026cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
break; break;
} }
@ -560,7 +560,7 @@ MxBool Hospital::HandleClick(LegoControlManagerEvent& p_param)
m_hospitalState->m_unk0x08.m_unk0x00 = 14; m_hospitalState->m_unk0x08.m_unk0x00 = 14;
PlayAction(HospitalScript::c_hho016cl_RunAnim); PlayAction(HospitalScript::c_hho016cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho016cl_RunAnim; m_currentAction = HospitalScript::c_hho016cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
} }
else if (m_unk0x128 == 0) { else if (m_unk0x128 == 0) {
@ -581,7 +581,7 @@ MxBool Hospital::HandleClick(LegoControlManagerEvent& p_param)
m_hospitalState->m_unk0x08.m_unk0x00 = 15; m_hospitalState->m_unk0x08.m_unk0x00 = 15;
PlayAction(HospitalScript::c_hho016cl_RunAnim); PlayAction(HospitalScript::c_hho016cl_RunAnim);
m_unk0x10c = HospitalScript::c_hho016cl_RunAnim; m_currentAction = HospitalScript::c_hho016cl_RunAnim;
m_unk0x108 = 1; m_unk0x108 = 1;
} }
else if (m_unk0x128 == 0) { else if (m_unk0x128 == 0) {
@ -641,16 +641,16 @@ MxResult Hospital::Tickle()
MxLong time = Timer()->GetTime(); MxLong time = Timer()->GetTime();
if (m_unk0x118 != 0) { if (m_unk0x118 != 0) {
if (time - m_unk0x11c > 300) { if (time - m_copLedAnimTimer > 300) {
m_unk0x11c = time; m_copLedAnimTimer = time;
g_unk0x100f791c = !g_unk0x100f791c; g_copLedEnabled = !g_copLedEnabled;
m_copLedBitmap->Enable(g_unk0x100f791c); m_copLedBitmap->Enable(g_copLedEnabled);
} }
if (time - m_unk0x120 > 200) { if (time - m_pizzaLedAnimTimer > 200) {
m_unk0x120 = time; m_pizzaLedAnimTimer = time;
g_unk0x100f7920 = !g_unk0x100f7920; g_pizzaLedEnabled = !g_pizzaLedEnabled;
m_pizzaLedBitmap->Enable(g_unk0x100f7920); m_pizzaLedBitmap->Enable(g_pizzaLedEnabled);
} }
} }