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

Fixes

Browse Source
This commit is contained in:
Christian Semmler 2024-02-13 18:33:48 -05:00
parent 28b1ba73cb
commit 9d8bc7cf87
3 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,18 +40,18 @@ class GasStation : public LegoWorld {
// GasStation::`scalar deleting destructor' // GasStation::`scalar deleting destructor'
private: private:
undefined2 m_unk0xf8; // 0xf8 undefined2 m_unk0xf8; // 0xf8
undefined2 m_unk0xfa; // 0xfa undefined2 m_unk0xfa; // 0xfa
undefined4 m_unk0xfc; // 0xfc undefined4 m_unk0xfc; // 0xfc
GasStationState* m_gasStationState; // 0x100 GasStationState* m_state; // 0x100
undefined2 m_unk0x104; // 0x104 undefined2 m_unk0x104; // 0x104
undefined2 m_unk0x106; // 0x106 undefined2 m_unk0x106; // 0x106
undefined4 m_unk0x108; // 0x108 undefined4 m_unk0x108; // 0x108
undefined4 m_unk0x10c; // 0x10c undefined4 m_unk0x10c; // 0x10c
undefined4 m_unk0x110; // 0x110 undefined4 m_unk0x110; // 0x110
undefined m_unk0x114; // 0x114 undefined m_unk0x114; // 0x114
undefined m_unk0x115; // 0x115 undefined m_unk0x115; // 0x115
Radio m_radio; // 0x118 Radio m_radio; // 0x118
}; };
#endif // GASSTATION_H #endif // GASSTATION_H

15
LEGO1/lego/legoomni/include/gasstationstate.h
View File

@ -7,6 +7,15 @@
// SIZE 0x24 // SIZE 0x24
class GasStationState : public LegoState { class GasStationState : public LegoState {
public: public:
// SIZE 0x04
struct Unknown0x14 {
inline void SetUnknown0x00(undefined4 p_unk0x00) { m_unk0x00 = p_unk0x00; }
inline undefined4 GetUnknown0x00() { return m_unk0x00; }
private:
undefined4 m_unk0x00; // 0x00
};
GasStationState(); GasStationState();
// FUNCTION: LEGO1 0x100061d0 // FUNCTION: LEGO1 0x100061d0
@ -27,12 +36,12 @@ class GasStationState : public LegoState {
// SYNTHETIC: LEGO1 0x10006290 // SYNTHETIC: LEGO1 0x10006290
// GasStationState::`scalar deleting destructor' // GasStationState::`scalar deleting destructor'
inline undefined4 GetUnknown0x14() { return m_unk0x14; } // inline undefined4 GetUnknown0x14() { return m_unk0x14.m_unk0x00; }
inline void SetUnknown0x14(undefined4 p_unk0x14) { m_unk0x14 = p_unk0x14; } inline Unknown0x14& GetUnknown0x14() { return m_unk0x14; }
private: private:
undefined4 m_unk0x08[3]; // 0x08 undefined4 m_unk0x08[3]; // 0x08
undefined4 m_unk0x14; // 0x14 Unknown0x14 m_unk0x14; // 0x14
undefined2 m_unk0x18; // 0x18 undefined2 m_unk0x18; // 0x18
undefined2 m_unk0x1a; // 0x1a undefined2 m_unk0x1a; // 0x1a
undefined2 m_unk0x1c; // 0x1c undefined2 m_unk0x1c; // 0x1c

25
LEGO1/lego/legoomni/src/gasstation/gasstation.cpp
View File

@ -7,13 +7,14 @@
#include "mxnotificationmanager.h" #include "mxnotificationmanager.h"
#include "mxticklemanager.h" #include "mxticklemanager.h"
// GLOBAL: LEGO1 0x100f0160
undefined4 g_unk0x100f0160; undefined4 g_unk0x100f0160;
// FUNCTION: LEGO1 0x100046a0 // FUNCTION: LEGO1 0x100046a0
GasStation::GasStation() GasStation::GasStation()
{ {
m_unk0xf8 = 0; m_unk0xf8 = 0;
m_gasStationState = NULL; m_state = NULL;
m_unk0xfc = 0; m_unk0xfc = 0;
m_unk0x108 = 0; m_unk0x108 = 0;
m_unk0x104 = 0; m_unk0x104 = 0;
@ -49,22 +50,26 @@ GasStation::~GasStation()
// FUNCTION: LEGO1 0x10004990 // FUNCTION: LEGO1 0x10004990
MxResult GasStation::Create(MxDSAction& p_dsAction) MxResult GasStation::Create(MxDSAction& p_dsAction)
{ {
MxResult ret = LegoWorld::Create(p_dsAction); MxResult result = LegoWorld::Create(p_dsAction);
if (ret == SUCCESS) { if (result == SUCCESS) {
InputManager()->SetWorld(this); InputManager()->SetWorld(this);
ControlManager()->Register(this); ControlManager()->Register(this);
} }
InputManager()->SetCamera(NULL); InputManager()->SetCamera(NULL);
m_gasStationState = (GasStationState*) GameState()->GetState("GasStationState"); m_state = (GasStationState*) GameState()->GetState("GasStationState");
if (!m_gasStationState) { if (!m_state) {
m_gasStationState = (GasStationState*) GameState()->CreateState("GasStationState"); m_state = (GasStationState*) GameState()->CreateState("GasStationState");
m_gasStationState->SetUnknown0x14(1); m_state->GetUnknown0x14().SetUnknown0x00(1);
} }
else { else {
if (m_gasStationState->GetUnknown0x14() != 4) { GasStationState::Unknown0x14& unk0x14 = m_state->GetUnknown0x14();
m_gasStationState->SetUnknown0x14(3); if (unk0x14.GetUnknown0x00() == 4) {
unk0x14.SetUnknown0x00(4);
}
else {
unk0x14.SetUnknown0x00(3);
} }
} }
@ -73,7 +78,7 @@ MxResult GasStation::Create(MxDSAction& p_dsAction)
InputManager()->Register(this); InputManager()->Register(this);
SetIsWorldActive(FALSE); SetIsWorldActive(FALSE);
return ret; return result;
} }
// STUB: LEGO1 0x10004a60 // STUB: LEGO1 0x10004a60