isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-21 15:21:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement Act2Actor::Act2Actor(), add structure and BETA10

Browse Source
This commit is contained in:
jonschz 2024-11-30 11:25:48 +01:00
parent f56ffddfdc
commit 70c7b5dca1
5 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
LEGO1/lego/legoomni/include/act2actor.h
View File

@ -5,9 +5,17 @@
// VTABLE: LEGO1 0x100d6078 LegoPathActor // VTABLE: LEGO1 0x100d6078 LegoPathActor
// VTABLE: LEGO1 0x100d6148 LegoAnimActor // VTABLE: LEGO1 0x100d6148 LegoAnimActor
// VTABLE: BETA10 0x101b80c0 LegoPathActor
// VTABLE: BETA10 0x101b81b0 LegoAnimActor
// SIZE 0x1a8 // SIZE 0x1a8
class Act2Actor : public LegoAnimActor { class Act2Actor : public LegoAnimActor {
public: public:
struct UnknownListStructure {
undefined m_unk0x00[28];
undefined m_unk0x1c;
undefined m_unk0x1d[3];
};
Act2Actor(); Act2Actor();
void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24 void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2) override; // vtable+0x24
@ -23,6 +31,10 @@ class Act2Actor : public LegoAnimActor {
// SYNTHETIC: LEGO1 0x1001a0a0 // SYNTHETIC: LEGO1 0x1001a0a0
// Act2Actor::`scalar deleting destructor' // Act2Actor::`scalar deleting destructor'
// GLOBAL: LEGO1 0x100d6070
// GLOBAL: BETA10 0x101b80b0
// `vbtable'
private: private:
undefined m_unk0x1c; // 0x1c undefined m_unk0x1c; // 0x1c
undefined m_unk0x1d; // 0x1d undefined m_unk0x1d; // 0x1d
@ -30,7 +42,7 @@ class Act2Actor : public LegoAnimActor {
MxBool m_unk0x1f; // 0x1f MxBool m_unk0x1f; // 0x1f
undefined4 m_unk0x20; // 0x20 undefined4 m_unk0x20; // 0x20
undefined4 m_unk0x24; // 0x24 undefined4 m_unk0x24; // 0x24
undefined4 m_unk0x28; // 0x28 undefined m_unk0x28; // 0x28
undefined4 m_unk0x2c; // 0x2c undefined4 m_unk0x2c; // 0x2c
undefined4 m_unk0x30; // 0x30 undefined4 m_unk0x30; // 0x30
undefined4 m_unk0x34; // 0x34 undefined4 m_unk0x34; // 0x34

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

@ -82,6 +82,7 @@ class LegoAnimActor : public virtual LegoPathActor {
// Vector<LegoAnimActorStruct *>::~Vector<LegoAnimActorStruct *> // Vector<LegoAnimActorStruct *>::~Vector<LegoAnimActorStruct *>
// SYNTHETIC: LEGO1 0x10012b90 // SYNTHETIC: LEGO1 0x10012b90
// SYNTHETIC: BETA10 0x1000fad0
// LegoAnimActor::`vbase destructor' // LegoAnimActor::`vbase destructor'
// TEMPLATE: LEGO1 0x1001c010 // TEMPLATE: LEGO1 0x1001c010

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

@ -18,6 +18,7 @@ extern MxLong g_unk0x100f3308;
extern const char* g_strHIT_WALL_SOUND; extern const char* g_strHIT_WALL_SOUND;
// VTABLE: LEGO1 0x100d6e28 // VTABLE: LEGO1 0x100d6e28
// VTABLE: BETA10 0x101bdc08
// SIZE 0x154 // SIZE 0x154
class LegoPathActor : public LegoActor { class LegoPathActor : public LegoActor {
public: public:

14
LEGO1/lego/legoomni/src/actors/act2actor.cpp
View File

@ -6,8 +6,14 @@
#include "roi/legoroi.h" #include "roi/legoroi.h"
DECOMP_SIZE_ASSERT(Act2Actor, 0x1a8) DECOMP_SIZE_ASSERT(Act2Actor, 0x1a8)
DECOMP_SIZE_ASSERT(Act2Actor::UnknownListStructure, 0x20)
// STUB: LEGO1 0x100187e0 // TODO: Copy the data once we know more about its fields. Total: 10 entries
// GLOBAL: LEGO1 0x100f0db8
static Act2Actor::UnknownListStructure g_unk0x100f0db8[] = {{{0}, 0, {0}}};
// FUNCTION: LEGO1 0x100187e0
// FUNCTION: BETA10 0x1000c7fb
Act2Actor::Act2Actor() Act2Actor::Act2Actor()
{ {
m_unk0x1c = 0; m_unk0x1c = 0;
@ -26,6 +32,11 @@ Act2Actor::Act2Actor()
m_unk0x4c = 0; m_unk0x4c = 0;
m_unk0x38 = 0; m_unk0x38 = 0;
m_unk0x3c = 0; m_unk0x3c = 0;
// TODO replace 10 by sizeOfArray once the data are there
for (MxS32 i = 0; i < 10; i++) {
g_unk0x100f0db8[i].m_unk0x1c = 0;
}
} }
// FUNCTION: LEGO1 0x10018940 // FUNCTION: LEGO1 0x10018940
@ -55,6 +66,7 @@ MxResult Act2Actor::VTable0x9c()
} }
// STUB: LEGO1 0x10018c30 // STUB: LEGO1 0x10018c30
// STUB: BETA10 0x1000cb52
void Act2Actor::VTable0x70(float p_und) void Act2Actor::VTable0x70(float p_und)
{ {
// TODO // TODO

2
LEGO1/lego/legoomni/src/paths/legopathactor.cpp
View File

@ -38,6 +38,7 @@ const char* g_strHIT_WALL_SOUND = "HIT_WALL_SOUND";
MxLong g_unk0x100f3308 = 0; MxLong g_unk0x100f3308 = 0;
// FUNCTION: LEGO1 0x1002d700 // FUNCTION: LEGO1 0x1002d700
// FUNCTION: BETA10 0x100ae6e0
LegoPathActor::LegoPathActor() LegoPathActor::LegoPathActor()
{ {
m_boundary = NULL; m_boundary = NULL;
@ -57,6 +58,7 @@ LegoPathActor::LegoPathActor()
} }
// FUNCTION: LEGO1 0x1002d820 // FUNCTION: LEGO1 0x1002d820
// FUNCTION: BETA10 0x100ae80e
LegoPathActor::~LegoPathActor() LegoPathActor::~LegoPathActor()
{ {
if (m_grec) { if (m_grec) {