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

Rename functions

Browse Source
This commit is contained in:
Christian Semmler 2024-01-31 07:31:29 -05:00
parent 5da883f0f0
commit 1efa003952
7 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
LEGO1/lego/legoomni/include/legogamestate.h
View File

@ -38,9 +38,10 @@ class LegoGameState {
inline MxU8 GetUnknownC() { return m_unk0x0c; }
inline MxU32 GetUnknown10() { return m_unk0x10; }
inline MxS32 GetCurrentAct() { return m_currentAct; }
inline undefined4 GetUnknown424() { return m_currentArea; }
inline MxU32 GetCurrentArea() { return m_currentArea; }
inline void SetDirty(MxBool p_dirty) { m_isDirty = p_dirty; }
inline void SetUnknown424(undefined4 p_unk0x424) { m_currentArea = p_unk0x424; }
inline void SetCurrentArea(MxU32 p_currentArea) { m_currentArea = p_currentArea; }
void SetSomeEnumState(undefined4 p_state);
void FUN_1003ceb0();
@ -75,8 +76,8 @@ class LegoGameState {
ScoreStruct m_unk0xa6; // 0xa6
undefined m_unk0x41a[8]; // 0x41a - might be part of the structure at 0xa6
MxBool m_isDirty; // 0x420
undefined4 m_currentArea; // 0x424
undefined4 m_previousArea; // 0x428
MxU32 m_currentArea; // 0x424
MxU32 m_previousArea; // 0x428
undefined4 m_unk0x42c; // 0x42c
};

4
LEGO1/lego/legoomni/src/build/helicopter.cpp
View File

@ -62,7 +62,7 @@ void Helicopter::VTable0xe4()
}
IslePathActor::VTable0xe4();
if (!GameState()->GetUnknown10()) {
GameState()->SetUnknown424(0x3c);
GameState()->SetCurrentArea(0x3c);
if (GetCurrentVehicle()) {
if (GetCurrentVehicle()->IsA("IslePathActor")) {
((IslePathActor*) GetCurrentVehicle())->VTable0xe8(0x37, TRUE, 7);
@ -148,7 +148,7 @@ MxU32 Helicopter::VTable0xd4(LegoControlManagerEvent& p_param)
else if (m_state->GetUnkown8() != 0)
break;
VTable0xe4();
GameState()->SetUnknown424(0x42);
GameState()->SetCurrentArea(0x42);
ret = 1;
break;
case 0x18: {

2
LEGO1/lego/legoomni/src/infocenter/elevatorbottom.cpp
View File

@ -38,7 +38,7 @@ MxResult ElevatorBottom::Create(MxDSAction& p_dsAction)
SetIsWorldActive(FALSE);
GameState()->SetUnknown424(5);
GameState()->SetCurrentArea(5);
GameState()->StopArea();
return result;

2
LEGO1/lego/legoomni/src/infocenter/infocenterdoor.cpp
View File

@ -39,7 +39,7 @@ MxResult InfocenterDoor::Create(MxDSAction& p_dsAction)
SetIsWorldActive(FALSE);
GameState()->SetUnknown424(3);
GameState()->SetCurrentArea(3);
GameState()->StopArea();
return result;

2
LEGO1/lego/legoomni/src/infocenter/score.cpp
View File

@ -52,7 +52,7 @@ MxResult Score::Create(MxDSAction& p_dsAction)
LegoGameState* gs = GameState();
ScoreState* state = (ScoreState*) gs->GetState("ScoreState");
m_state = state ? state : (ScoreState*) gs->CreateState("ScoreState");
GameState()->SetUnknown424(0xd);
GameState()->SetCurrentArea(0xd);
GameState()->StopArea();
}

4
LEGO1/lego/legoomni/src/isle/isle.cpp
View File

@ -75,8 +75,8 @@ MxResult Isle::Create(MxDSAction& p_dsAction)
m_unk0x13c = 2;
}
if (GameState()->GetUnknown424() == 1) {
GameState()->SetUnknown424(0);
if (GameState()->GetCurrentArea() == 1) {
GameState()->SetCurrentArea(0);
}
LegoGameState* gameState = GameState();

2
LEGO1/lego/legoomni/src/police/police.cpp
View File

@ -55,7 +55,7 @@ MxResult Police::Create(MxDSAction& p_dsAction)
}
m_policeState = policeState;
GameState()->SetUnknown424(0x22);
GameState()->SetCurrentArea(0x22);
GameState()->StopArea();
return ret;
}