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

Implement more functions in Act2Actor (#1183)

Browse Source 
* Implement `Act2Actor::VTable0xa0`

* Implement `Act2Actor::FUN_10019520()`

* Implement/match `Act2Actor::FUN_100192a0()`

* Fix clang32 issue

* Address review comments

---------

Co-authored-by: jonschz <jonschz@users.noreply.github.com>
This commit is contained in:
jonschz
2024-12-01 18:21:59 +01:00
committed by GitHub
parent f066e2ee2e
commit 8b9f6f1007
4 changed files with 212 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,9 +11,10 @@
class Act2Actor : public LegoAnimActor {
public:
struct UnknownListStructure {
undefined m_unk0x00[28];
undefined m_unk0x1c;
undefined m_unk0x1d[3];
MxFloat m_unk0x00[3]; // 0x00
MxFloat m_unk0x0c[3]; // 0x0c
const char* m_unk0x18; // 0x18
undefined m_unk0x1c; // 0x1c
};
Act2Actor();
@@ -27,6 +28,7 @@ public:
MxS32 VTable0xa0() override; // vtable+0xa0
void FUN_10019520();
void FUN_100192a0(undefined4 p_param);
// SYNTHETIC: LEGO1 0x1001a0a0
// Act2Actor::`scalar deleting destructor'
@@ -37,12 +39,12 @@ public:
private:
undefined m_unk0x1c; // 0x1c
undefined m_unk0x1d; // 0x1d
MxS8 m_unk0x1d; // 0x1d
undefined m_unk0x1e; // 0x1e
MxBool m_unk0x1f; // 0x1f
undefined4 m_unk0x20; // 0x20
undefined4 m_unk0x24; // 0x24
undefined m_unk0x28; // 0x28
MxS8 m_unk0x28; // 0x28
undefined4 m_unk0x2c; // 0x2c
undefined4 m_unk0x30; // 0x30
undefined4 m_unk0x34; // 0x34
@@ -50,8 +52,11 @@ private:
undefined4 m_unk0x3c; // 0x3c
undefined m_unk0x40; // 0x40
undefined4 m_unk0x44; // 0x44
undefined m_unk0x48; // 0x48
MxS8 m_unk0x48; // 0x48
undefined4 m_unk0x4c; // 0x4c
};
// TEMPLATE: LEGO1 0x100194f0
// list<LegoBoundaryEdge,allocator<LegoBoundaryEdge> >::list<LegoBoundaryEdge,allocator<LegoBoundaryEdge> >
#endif // ACT2ACTOR_H

11
LEGO1/lego/legoomni/include/legopathcontroller.h
View File

@@ -117,6 +117,17 @@ public:
LegoUnknown100db7f4*& p_edge,
LegoPathBoundary*& p_boundary
);
MxResult FUN_10048310(
LegoPathEdgeContainer* p_grec,
const Vector3& p_position,
const Vector3& p_direction,
LegoPathBoundary* p_boundary1,
const Vector3& p_param5,
const Vector3& p_param6,
LegoPathBoundary* p_boundary2,
MxBool p_param8,
MxFloat* p_param9
);
static MxResult Init();
static MxResult Reset();