implement LegoWorldPresenter deconstructor (#425)

* Implement LegoWorldPresenter::~LegoWorldPresenter

* Rename incorrect function name

* fixes

* Rename functions

* fix format
This commit is contained in:
Misha
2024-01-12 17:27:07 -05:00
committed by GitHub
parent 602ba30fae
commit 3c0bf7191c
15 changed files with 75 additions and 20 deletions

View File

@@ -27,7 +27,7 @@ public:
}
virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18
virtual void Stop() override; // vtable+0x50
virtual void VTable0x50() override; // vtable+0x50
virtual MxBool VTable0x5c() override; // vtable+0x5c
virtual MxBool VTable0x64() override; // vtable+0x64
virtual void VTable0x68(MxBool p_add) override; // vtable+0x68

View File

@@ -41,7 +41,7 @@ public:
}
virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+0x18
virtual void Stop() override; // vtable+50
virtual void VTable0x50() override; // vtable+50
virtual void VTable0x58(MxCore* p_object) override; // vtable+58
// FUNCTION: LEGO1 0x10030900
virtual MxBool VTable0x5c() override { return TRUE; } // vtable+5c

View File

@@ -1,6 +1,7 @@
#ifndef LEGOANIMATIONMANAGER_H
#define LEGOANIMATIONMANAGER_H
#include "decomp.h"
#include "mxcore.h"
// VTABLE: LEGO1 0x100d8c18
@@ -27,6 +28,7 @@ public:
}
void FUN_1005f6d0(MxBool);
void FUN_1005f720(undefined4);
void FUN_10064670(MxBool);
__declspec(dllexport) static void configureLegoAnimationManager(MxS32 p_legoAnimationManagerConfig);

View File

@@ -19,6 +19,8 @@ public:
__declspec(dllexport) static void configureLegoBuildingManager(MxS32);
void FUN_1002fa00();
private:
void Init();
};

View File

@@ -1,6 +1,7 @@
#ifndef LEGOPLANTMANAGER_H
#define LEGOPLANTMANAGER_H
#include "decomp.h"
#include "mxcore.h"
// VTABLE: LEGO1 0x100d6758
@@ -19,6 +20,8 @@ public:
return "LegoPlantManager";
}
void FUN_10026360(undefined4 p_world);
private:
void Init();
};

View File

@@ -33,7 +33,7 @@ public:
return !strcmp(p_name, LegoWorld::ClassName()) || LegoEntity::IsA(p_name);
}
virtual void Stop(); // vtable+50
virtual void VTable0x50(); // vtable+50
virtual void VTable0x54(); // vtable+54
virtual void VTable0x58(MxCore* p_object); // vtable+58
virtual MxBool VTable0x5c(); // vtable+5c
@@ -43,6 +43,7 @@ public:
virtual void VTable0x68(MxBool p_add); // vtable+68
inline LegoCameraController* GetCamera() { return m_camera; }
inline undefined4 GetUnknown0xec() { return m_unk0xec; }
undefined FUN_100220e0();
MxResult SetAsCurrentWorld(MxDSObject& p_dsObject);
@@ -60,9 +61,11 @@ protected:
LegoCameraController* m_camera; // 0x98
undefined m_unk0x9c[0x1c]; // 0x9c
MxPresenterList m_list0xb8; // 0xb8
undefined m_unk0xd0[0x24]; // 0xd0
undefined m_unk0xd0[0x1c]; // 0xd0
undefined4 m_unk0xec; // 0xec
undefined4 m_unk0xf0; // 0xf0
MxS16 m_unk0xf4; // 0xf4
MxBool m_unk0xf6; // 0xf6
MxBool m_worldStarted; // 0xf6
undefined m_unk0xf7; // 0xf7
};

View File

@@ -32,7 +32,7 @@ public:
// Score::`scalar deleting destructor'
virtual MxResult Create(MxDSObject& p_dsObject) override; // vtable+18
virtual void Stop() override; // vtable+50
virtual void VTable0x50() override; // vtable+50
virtual MxBool VTable0x5c() override; // vtable+5c
virtual MxBool VTable0x64() override; // vtable+64
virtual void VTable0x68(MxBool p_add) override; // vtable+68