slight style tweaks to legogamestate and related members (#666)

This commit is contained in:
Ramen2X
2024-03-13 13:17:20 -04:00
committed by GitHub
parent 4aafc435f5
commit beb30e80ea
21 changed files with 104 additions and 104 deletions

View File

@@ -42,7 +42,7 @@ public:
// ElevatorBottom::`scalar deleting destructor'
private:
LegoGameState::Area m_unk0xf8; // 0xf8
LegoGameState::Area m_destLocation; // 0xf8
MxLong HandleClick(LegoControlManagerEvent& p_param);
};

View File

@@ -45,18 +45,18 @@ private:
MxLong HandleKeyPress(MxS8 p_key);
MxLong HandleButtonDown(LegoControlManagerEvent& p_param);
undefined2 m_unk0xf8; // 0xf8
undefined2 m_unk0xfa; // 0xfa
LegoGameState::Area m_transitionDestination; // 0xfc
GasStationState* m_state; // 0x100
undefined2 m_unk0x104; // 0x104
undefined2 m_unk0x106; // 0x106
undefined4 m_unk0x108; // 0x108
undefined4 m_unk0x10c; // 0x10c
undefined4 m_unk0x110; // 0x110
undefined m_unk0x114; // 0x114
undefined m_unk0x115; // 0x115
Radio m_radio; // 0x118
undefined2 m_unk0xf8; // 0xf8
undefined2 m_unk0xfa; // 0xfa
LegoGameState::Area m_destLocation; // 0xfc
GasStationState* m_state; // 0x100
undefined2 m_unk0x104; // 0x104
undefined2 m_unk0x106; // 0x106
undefined4 m_unk0x108; // 0x108
undefined4 m_unk0x10c; // 0x10c
undefined4 m_unk0x110; // 0x110
undefined m_unk0x114; // 0x114
undefined m_unk0x115; // 0x115
Radio m_radio; // 0x118
};
#endif // GASSTATION_H

View File

@@ -36,10 +36,10 @@ public:
// HistoryBook::`scalar deleting destructor'
private:
LegoGameState::Area m_transitionDestination; // 0xf8
MxStillPresenter* m_alphabet[26]; // 0xfc
MxStillPresenter* m_names[20][7]; // 0x164
MxStillPresenter* m_scores[20]; // 0x394
LegoGameState::Area m_destLocation; // 0xf8
MxStillPresenter* m_alphabet[26]; // 0xfc
MxStillPresenter* m_names[20][7]; // 0x164
MxStillPresenter* m_scores[20]; // 0x394
};
#endif // HISTORYBOOK_H

View File

@@ -3,6 +3,7 @@
#include "decomp.h"
#include "hospitalstate.h"
#include "legogamestate.h"
#include "legoworld.h"
// VTABLE: LEGO1 0x100d9730
@@ -38,19 +39,19 @@ public:
// Hospital::`scalar deleting destructor'
private:
undefined2 m_unk0xf8; // 0xf8
undefined4 m_unk0xfc; // 0xfc
undefined2 m_unk0x100; // 0x100
HospitalState* m_hospitalState; // 0x104
undefined2 m_unk0x108; // 0x108
undefined4 m_unk0x10c; // 0x10c
undefined4 m_unk0x110; // 0x110
undefined4 m_unk0x114; // 0x114
undefined m_unk0x118; // 0x118
undefined4 m_unk0x11c; // 0x11c
undefined4 m_unk0x120; // 0x120
undefined m_unk0x124[4]; // 0x124
undefined m_unk0x128; // 0x128
undefined2 m_unk0xf8; // 0xf8
LegoGameState::Area m_destLocation; // 0xfc
undefined2 m_unk0x100; // 0x100
HospitalState* m_hospitalState; // 0x104
undefined2 m_unk0x108; // 0x108
undefined4 m_unk0x10c; // 0x10c
undefined4 m_unk0x110; // 0x110
undefined4 m_unk0x114; // 0x114
undefined m_unk0x118; // 0x118
undefined4 m_unk0x11c; // 0x11c
undefined4 m_unk0x120; // 0x120
undefined m_unk0x124[4]; // 0x124
undefined m_unk0x128; // 0x128
};
#endif // HOSPITAL_H

View File

@@ -102,7 +102,7 @@ private:
InfomainScript::Script m_currentInfomainScript; // 0xf8
MxS16 m_selectedCharacter; // 0xfc
InfocenterState* m_infocenterState; // 0x100
LegoGameState::Area m_transitionDestination; // 0x104
LegoGameState::Area m_destLocation; // 0x104
Cutscene m_currentCutscene; // 0x108
Radio m_radio; // 0x10c
MxStillPresenter* m_unk0x11c; // 0x11c

View File

@@ -41,7 +41,7 @@ public:
// InfocenterDoor::`scalar deleting destructor'
private:
LegoGameState::Area m_unk0xf8; // 0xf8
LegoGameState::Area m_destLocation; // 0xf8
MxLong HandleClick(LegoControlManagerEvent& p_param);
};

View File

@@ -44,9 +44,9 @@ public:
private:
MxBool HandleClick(LegoControlManagerEvent& p_param);
LegoGameState::Area m_transitionDestination; // 0xf8
JukeBoxState* m_state; // 0xfc
undefined2 m_unk0x100; // 0x100
LegoGameState::Area m_destLocation; // 0xf8
JukeBoxState* m_state; // 0xfc
undefined2 m_unk0x100; // 0x100
};
#endif // JUKEBOX_H

View File

@@ -28,7 +28,7 @@ public:
};
enum Area {
e_noArea = 0,
e_undefined = 0,
e_previousArea = 0,
e_isle,
e_infomain,

View File

@@ -48,9 +48,9 @@ private:
MxLong HandleEndAction(MxEndActionNotificationParam& p_param);
MxLong HandleKeyPress(LegoEventNotificationParam& p_param);
Radio m_radio; // 0xf8
PoliceState* m_policeState; // 0x108
LegoGameState::Area m_transitionDestination; // 0x10c
Radio m_radio; // 0xf8
PoliceState* m_policeState; // 0x108
LegoGameState::Area m_destLocation; // 0x10c
};
#endif // POLICE_H

View File

@@ -44,7 +44,7 @@ public:
void FillArea(MxU32 p_x, MxU32 p_y, MxS16 p_color);
protected:
LegoGameState::Area m_unk0xf8;
LegoGameState::Area m_destLocation;
ScoreState* m_state;
MxU8* m_surface;