diff --git a/LEGO1/lego/legoomni/include/gasstation.h b/LEGO1/lego/legoomni/include/gasstation.h index c6df1d3a..9071aba5 100644 --- a/LEGO1/lego/legoomni/include/gasstation.h +++ b/LEGO1/lego/legoomni/include/gasstation.h @@ -55,10 +55,10 @@ class GasStation : public LegoWorld { undefined2 m_unk0x104; // 0x104 undefined2 m_unk0x106; // 0x106 MxStillPresenter* m_trackLedBitmap; // 0x108 - undefined4 m_unk0x10c; // 0x10c - undefined4 m_trackLedTimer; // 0x110 - undefined m_unk0x114; // 0x114 - undefined m_unk0x115; // 0x115 + MxLong m_unk0x10c; // 0x10c + MxLong m_trackLedTimer; // 0x110 + MxBool m_unk0x114; // 0x114 + MxBool m_unk0x115; // 0x115 Radio m_radio; // 0x118 }; diff --git a/LEGO1/lego/legoomni/src/worlds/gasstation.cpp b/LEGO1/lego/legoomni/src/worlds/gasstation.cpp index 477931f9..9f4f870f 100644 --- a/LEGO1/lego/legoomni/src/worlds/gasstation.cpp +++ b/LEGO1/lego/legoomni/src/worlds/gasstation.cpp @@ -33,10 +33,10 @@ GasStation::GasStation() m_destLocation = LegoGameState::e_undefined; m_trackLedBitmap = NULL; m_unk0x104 = 0; - m_unk0x114 = 0; + m_unk0x114 = FALSE; m_unk0x106 = 0; m_unk0x10c = 0; - m_unk0x115 = 0; + m_unk0x115 = FALSE; m_trackLedTimer = 0; NotificationManager()->Register(this); @@ -379,7 +379,8 @@ MxResult GasStation::Tickle() } MxLong time = Timer()->GetTime(); - if (m_unk0x114 != 0) { + + if (m_unk0x114) { if (time - m_unk0x10c > 15000) { m_unk0x10c = time; if (m_unk0x104 == 1) { @@ -387,13 +388,15 @@ MxResult GasStation::Tickle() } else if (m_unk0x104 != 0) { m_unk0x104 = 0; + MxDSAction action; m_state->m_unk0x14.m_unk0x00 = 9; PlayAction(GarageScript::c_wgs031nu_RunAnim); m_unk0x106 = 1; } } } - if (m_unk0x115 != 0) { + + if (m_unk0x115) { if (time - m_trackLedTimer > 300) { m_trackLedTimer = time; g_trackLedEnabled = !g_trackLedEnabled;