mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-12-10 16:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor/improve matches in Act1State (#1143)

Browse Source 
* Refactor/improve matches in Act1State

* Fix naming
This commit is contained in:
Christian Semmler
2024-11-10 14:47:12 -07:00
committed by GitHub
parent 5d3d66965d
commit cd261b9518
8 changed files with 200 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
LEGO1/lego/legoomni/include/isle.h
View File

@@ -83,21 +83,21 @@ public:
LegoNamedPlane m_bikePlane; // 0x070
LegoNamedPlane m_skateboardPlane; // 0x0bc
LegoNamedPlane m_helicopterPlane; // 0x108
LegoNamedTexture* m_unk0x154; // 0x154
LegoNamedTexture* m_unk0x158; // 0x158
LegoNamedTexture* m_unk0x15c; // 0x15c
LegoNamedTexture* m_helicopterWindshield; // 0x154
LegoNamedTexture* m_helicopterJetLeft; // 0x158
LegoNamedTexture* m_helicopterJetRight; // 0x15c
Helicopter* m_helicopter; // 0x160
LegoNamedPlane m_jetskiPlane; // 0x164
LegoNamedTexture* m_unk0x1b0; // 0x1b0
LegoNamedTexture* m_unk0x1b4; // 0x1b4
LegoNamedTexture* m_jetskiFront; // 0x1b0
LegoNamedTexture* m_jetskiWindshield; // 0x1b4
Jetski* m_jetski; // 0x1b8
LegoNamedPlane m_dunebuggyPlane; // 0x1bc
LegoNamedTexture* m_unk0x208; // 0x208
LegoNamedTexture* m_dunebuggyFront; // 0x208
DuneBuggy* m_dunebuggy; // 0x20c
LegoNamedPlane m_racecarPlane; // 0x210
LegoNamedTexture* m_unk0x25c; // 0x25c
LegoNamedTexture* m_unk0x260; // 0x260
LegoNamedTexture* m_unk0x264; // 0x264
LegoNamedTexture* m_racecarFront; // 0x25c
LegoNamedTexture* m_racecarBack; // 0x260
LegoNamedTexture* m_racecarTail; // 0x264
RaceCar* m_racecar; // 0x268
};

5
LEGO1/lego/legoomni/include/legonamedplane.h
View File

@@ -14,7 +14,7 @@ public:
// FUNCTION: LEGO1 0x10033a70
// LegoNamedPlane::~LegoNamedPlane
const MxString* GetName() const { return &m_name; }
const char* GetName() const { return m_name.GetData(); }
const Mx3DPointFloat& GetPosition() { return m_position; }
const Mx3DPointFloat& GetDirection() { return m_direction; }
const Mx3DPointFloat& GetUp() { return m_up; }
@@ -24,6 +24,9 @@ public:
void SetDirection(const Mx3DPointFloat& p_direction) { m_direction = p_direction; }
void SetUp(const Mx3DPointFloat& p_up) { m_up = p_up; }
MxBool IsPresent() { return strcmp(m_name.GetData(), "") != 0; }
void Reset() { m_name = ""; }
// FUNCTION: LEGO1 0x100344d0
MxResult Serialize(LegoFile* p_file)
{

1
LEGO1/lego/legoomni/include/legostate.h
View File

@@ -73,6 +73,7 @@ public:
return SUCCESS;
}
private:
MxU32* m_objectIds; // 0x00
MxS16 m_length; // 0x04
MxS16 m_mode; // 0x06