isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-11-29 19:05:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Changes to GasStation::Create based on beta debug build (#664)

Browse source 
* Implement/match LegoAnimNodeData::FUN_100a0990

* Change GasStation::Create based on beta debug build
This commit is contained in:
Christian Semmler 2024-03-13 11:38:38 -04:00 committed by GitHub
parent dcc3946a08
commit 06080b6492
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
LEGO1/lego/legoomni/include/gasstationstate.h
View file

@ -9,10 +9,6 @@ class GasStationState : public LegoState {
public: public:
// SIZE 0x04 // SIZE 0x04
struct Unknown0x14 { struct Unknown0x14 {
inline void SetUnknown0x00(undefined4 p_unk0x00) { m_unk0x00 = p_unk0x00; }
inline undefined4 GetUnknown0x00() { return m_unk0x00; }
private:
undefined4 m_unk0x00; // 0x00 undefined4 m_unk0x00; // 0x00
}; };
@ -36,7 +32,7 @@ class GasStationState : public LegoState {
// SYNTHETIC: LEGO1 0x10006290 // SYNTHETIC: LEGO1 0x10006290
// GasStationState::`scalar deleting destructor' // GasStationState::`scalar deleting destructor'
inline Unknown0x14& GetUnknown0x14() { return m_unk0x14; } friend class GasStation;
private: private:
undefined4 m_unk0x08[3]; // 0x08 undefined4 m_unk0x08[3]; // 0x08

13
LEGO1/lego/legoomni/src/worlds/gasstation.cpp
View file

@ -62,16 +62,13 @@ MxResult GasStation::Create(MxDSAction& p_dsAction)
m_state = (GasStationState*) GameState()->GetState("GasStationState"); m_state = (GasStationState*) GameState()->GetState("GasStationState");
if (!m_state) { if (!m_state) {
m_state = (GasStationState*) GameState()->CreateState("GasStationState"); m_state = (GasStationState*) GameState()->CreateState("GasStationState");
m_state->GetUnknown0x14().SetUnknown0x00(1); m_state->m_unk0x14.m_unk0x00 = 1;
}
else if (m_state->m_unk0x14.m_unk0x00 == 4) {
m_state->m_unk0x14.m_unk0x00 = 4;
} }
else { else {
GasStationState::Unknown0x14& unk0x14 = m_state->GetUnknown0x14(); m_state->m_unk0x14.m_unk0x00 = 3;
if (unk0x14.GetUnknown0x00() == 4) {
unk0x14.SetUnknown0x00(4);
}
else {
unk0x14.SetUnknown0x00(3);
}
} }
GameState()->SetCurrentArea(LegoGameState::e_garage); GameState()->SetCurrentArea(LegoGameState::e_garage);