Implement/match LegoEntity::VTable0x34 (#633)

* Implement/match LegoEntity::VTable0x34

* Change parameter name

* Fix order
This commit is contained in:
Christian Semmler
2024-03-06 14:12:20 -05:00
committed by GitHub
parent 71bcd4c771
commit a12146f52f
10 changed files with 76 additions and 14 deletions

View File

@@ -5,6 +5,8 @@
#include "misc/legostorage.h"
#include "mxcore.h"
class LegoROI;
// VTABLE: LEGO1 0x100d6f50
// SIZE 0x30
class LegoBuildingManager : public MxCore {
@@ -29,6 +31,7 @@ public:
void FUN_1002fb30();
MxResult Save(LegoStorage* p_storage);
MxResult Load(LegoStorage* p_storage);
MxU32 FUN_1002ff40(LegoROI*, MxBool);
void FUN_10030590();
// SYNTHETIC: LEGO1 0x1002f940

View File

@@ -17,6 +17,10 @@ public:
c_bit2 = 0x02
};
enum {
c_altBit1 = 0x01
};
inline LegoEntity() { Init(); }
// FUNCTION: LEGO1 0x1000c290
@@ -51,13 +55,13 @@ public:
// FUNCTION: LEGO1 0x10001090
virtual void SetWorldSpeed(MxFloat p_worldSpeed) { m_worldSpeed = p_worldSpeed; } // vtable+0x30
virtual void VTable0x34(); // vtable+0x34
virtual void VTable0x38(); // vtable+0x38
virtual void VTable0x3c(); // vtable+0x3c
virtual void VTable0x40(); // vtable+0x40
virtual void VTable0x44(); // vtable+0x44
virtual void VTable0x48(); // vtable+0x48
virtual void VTable0x4c(); // vtable+0x4c
virtual void VTable0x34(MxBool p_und); // vtable+0x34
virtual void VTable0x38(); // vtable+0x38
virtual void VTable0x3c(); // vtable+0x3c
virtual void VTable0x40(); // vtable+0x40
virtual void VTable0x44(); // vtable+0x44
virtual void VTable0x48(); // vtable+0x48
virtual void VTable0x4c(); // vtable+0x4c
void FUN_10010c30();
void FUN_100114e0(MxU8 p_unk0x59);
@@ -65,6 +69,7 @@ public:
inline LegoROI* GetROI() { return m_roi; }
inline MxU8 GetFlags() { return m_flags; }
inline MxBool GetUnknown0x10IsSet(MxU8 p_flag) { return m_unk0x10 & p_flag; }
inline void SetFlags(MxU8 p_flags) { m_flags = p_flags; }
inline void SetFlag(MxU8 p_flag) { m_flags |= p_flag; }
@@ -74,7 +79,7 @@ protected:
void Init();
void SetWorld();
undefined m_unk0x10; // 0x10
MxU8 m_unk0x10; // 0x10
MxU8 m_flags; // 0x11
Mx3DPointFloat m_worldLocation; // 0x14
Mx3DPointFloat m_worldDirection; // 0x28

View File

@@ -5,6 +5,8 @@
#include "misc/legostorage.h"
#include "mxcore.h"
class LegoROI;
// VTABLE: LEGO1 0x100d6758
// SIZE 0x2c
class LegoPlantManager : public MxCore {
@@ -26,6 +28,7 @@ public:
void FUN_100263a0(undefined4 p_und);
void Save(LegoStorage* p_storage);
MxResult Load(LegoStorage* p_storage);
MxU32 FUN_10026ba0(LegoROI*, MxBool);
void FUN_10027120();
static void SetCustomizeAnimFile(const char* p_value);

View File

@@ -66,9 +66,12 @@ public:
void FUN_100832a0();
void FUN_10083db0(LegoROI* p_roi);
void FUN_10083f10(LegoROI* p_roi);
MxU32 FUN_10085140(LegoROI*, MxBool);
LegoROI* FUN_10085210(const LegoChar*, LegoChar*, undefined);
LegoROI* FUN_10085a80(LegoChar* p_und1, LegoChar* p_und2, undefined p_und3);
static const char* GetCustomizeAnimFile() { return g_customizeAnimFile; }
private:
static char* g_customizeAnimFile;