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

fix

Browse Source
This commit is contained in:
Christian Semmler 2024-04-06 06:44:36 -04:00
parent 4d2368d9cb
commit 415880d754
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
LEGO1/lego/legoomni/include/gasstation.h
View File

@ -44,7 +44,6 @@ class GasStation : public LegoWorld {
// GasStation::`scalar deleting destructor' // GasStation::`scalar deleting destructor'
private: private:
void FUN_10005590(MxU32 p_objectId);
MxLong HandleEndAction(MxEndActionNotificationParam& p_param); MxLong HandleEndAction(MxEndActionNotificationParam& p_param);
MxLong HandleKeyPress(MxS8 p_key); MxLong HandleKeyPress(MxS8 p_key);
MxLong HandleButtonDown(LegoControlManagerEvent& p_param); MxLong HandleButtonDown(LegoControlManagerEvent& p_param);

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

@ -122,7 +122,6 @@ void GasStation::ReadyWorld()
PlayMusic(JukeboxScript::c_JBMusic2); PlayMusic(JukeboxScript::c_JBMusic2);
m_trackLedBitmap = (MxStillPresenter*) Find("MxStillPresenter", "TrackLed_Bitmap"); m_trackLedBitmap = (MxStillPresenter*) Find("MxStillPresenter", "TrackLed_Bitmap");
m_currentActorId = CurrentActor()->GetActorId(); m_currentActorId = CurrentActor()->GetActorId();
switch (m_currentActorId) { switch (m_currentActorId) {
@ -150,6 +149,7 @@ void GasStation::ReadyWorld()
m_unk0x104 = 1; m_unk0x104 = 1;
break; break;
} }
if (m_state->m_unk0x18 < 5) { if (m_state->m_unk0x18 < 5) {
m_state->m_unk0x18 += 1; m_state->m_unk0x18 += 1;
} }
@ -174,6 +174,7 @@ void GasStation::ReadyWorld()
m_unk0x104 = 1; m_unk0x104 = 1;
break; break;
} }
if (m_state->m_unk0x1a < 5) { if (m_state->m_unk0x1a < 5) {
m_state->m_unk0x1a += 1; m_state->m_unk0x1a += 1;
} }
@ -193,11 +194,12 @@ void GasStation::ReadyWorld()
break; break;
default: default:
m_state->m_unk0x14.m_unk0x00 = 6; m_state->m_unk0x14.m_unk0x00 = 6;
FUN_10005590(GarageScript::c_wgs017nu_RunAnim); PlayAction(GarageScript::c_wgs017nu_RunAnim);
m_unk0x106 = 1; m_unk0x106 = 1;
m_unk0x104 = 1; m_unk0x104 = 1;
break; break;
} }
if (m_state->m_unk0x1c < 5) { if (m_state->m_unk0x1c < 5) {
m_state->m_unk0x1c += 1; m_state->m_unk0x1c += 1;
} }
@ -222,6 +224,7 @@ void GasStation::ReadyWorld()
m_unk0x104 = 1; m_unk0x104 = 1;
break; break;
} }
if (m_state->m_unk0x1e < 5) { if (m_state->m_unk0x1e < 5) {
m_state->m_unk0x1e += 1; m_state->m_unk0x1e += 1;
} }
@ -231,21 +234,22 @@ void GasStation::ReadyWorld()
switch (m_state->m_unk0x20) { switch (m_state->m_unk0x20) {
case 0: case 0:
m_state->m_unk0x14.m_unk0x00 = 5; m_state->m_unk0x14.m_unk0x00 = 5;
FUN_10005590(GarageScript::c_wgs020nu_RunAnim); PlayAction(GarageScript::c_wgs020nu_RunAnim);
m_unk0x106 = 1; m_unk0x106 = 1;
break; break;
case 1: case 1:
m_state->m_unk0x14.m_unk0x00 = 5; m_state->m_unk0x14.m_unk0x00 = 5;
FUN_10005590(GarageScript::c_wgs021nu_RunAnim); PlayAction(GarageScript::c_wgs021nu_RunAnim);
m_unk0x106 = 1; m_unk0x106 = 1;
break; break;
default: default:
m_state->m_unk0x14.m_unk0x00 = 6; m_state->m_unk0x14.m_unk0x00 = 6;
FUN_10005590(GarageScript::c_wgs022nu_RunAnim); PlayAction(GarageScript::c_wgs022nu_RunAnim);
m_unk0x106 = 1; m_unk0x106 = 1;
m_unk0x104 = 1; m_unk0x104 = 1;
break; break;
} }
if (m_state->m_unk0x20 < 5) { if (m_state->m_unk0x20 < 5) {
m_state->m_unk0x20 += 1; m_state->m_unk0x20 += 1;
} }
@ -257,11 +261,6 @@ void GasStation::ReadyWorld()
} }
// FUNCTION: LEGO1 0x10005590 // FUNCTION: LEGO1 0x10005590
void GasStation::FUN_10005590(MxU32 p_objectId)
{
PlayAction(p_objectId);
}
inline void GasStation::PlayAction(MxU32 p_objectId) inline void GasStation::PlayAction(MxU32 p_objectId)
{ {
MxDSAction action; MxDSAction action;