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

Implement LegoAct2::Tickle() and others (#1168)

Browse Source 
* Implement `LegoAct2::Tickle()` and others

* Fix decomplint errors

* Minor cleanup

* Address review comments

---------

Co-authored-by: jonschz <jonschz@users.noreply.github.com>
This commit is contained in:
jonschz
2024-11-25 23:24:46 +01:00
committed by GitHub
parent b9a1da6a7a
commit 83b85f26a7
14 changed files with 221 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,8 @@ public:
MxResult VTable0x9c() override; // vtable+0x9c
MxS32 VTable0xa0() override; // vtable+0xa0
void FUN_10019520();
// SYNTHETIC: LEGO1 0x1001a0a0
// Act2Actor::`scalar deleting destructor'

13
LEGO1/lego/legoomni/include/legoact2.h
View File

@@ -66,6 +66,15 @@ public:
void SetUnknown0x1138(Act2Actor* p_unk0x1138) { m_unk0x1138 = p_unk0x1138; }
void SetUnknown0x1150(undefined4 p_unk0x1150) { m_unk0x1150 = p_unk0x1150; }
undefined4 FUN_10052560(
undefined4 p_param1,
MxBool p_param2,
MxBool p_param3,
Mx3DPointFloat* p_param4,
Mx3DPointFloat* p_param5,
Mx3DPointFloat* p_param6
);
// SYNTHETIC: LEGO1 0x1004fe20
// LegoAct2::`scalar deleting destructor'
@@ -79,9 +88,9 @@ private:
undefined4 m_unk0x10c4; // 0x10c4
undefined4 m_unk0x10c8; // 0x10c8
LegoAct2State* m_gameState; // 0x10cc
undefined4 m_unk0x10d0; // 0x10d0
MxS32 m_unk0x10d0; // 0x10d0
char* m_unk0x10d4; // 0x10d4
undefined4 m_unk0x10d8; // 0x10d8
LegoROI* m_unk0x10d8; // 0x10d8
MxMatrix m_unk0x10dc; // 0x10dc
undefined4 m_unk0x1124; // 0x1124
undefined4 m_unk0x1128; // 0x1128

3
LEGO1/lego/legoomni/include/legoanimationmanager.h
View File

@@ -155,7 +155,9 @@ public:
MxBool FindVehicle(const char* p_name, MxU32& p_index);
MxResult ReadAnimInfo(LegoFile* p_file, AnimInfo* p_info);
MxResult ReadModelInfo(LegoFile* p_file, ModelInfo* p_info);
void FUN_10060480(LegoChar* p_param1[], undefined4 p_param2);
void FUN_100604d0(MxBool p_unk0x08);
void FUN_100604f0(MxS32* p_param1, undefined4 p_param2);
void FUN_10060540(MxBool p_unk0x29);
void FUN_10060570(MxBool p_unk0x1a);
MxResult StartEntityAction(MxDSAction& p_dsAction, LegoEntity* p_entity);
@@ -181,6 +183,7 @@ public:
MxResult FUN_10064670(Vector3* p_position);
MxResult FUN_10064740(Vector3* p_position);
MxResult FUN_10064880(const char* p_name, MxS32 p_unk0x0c, MxS32 p_unk0x10);
undefined FUN_10064ee0(MxU32 p_param);
static void configureLegoAnimationManager(MxS32 p_legoAnimationManagerConfig);

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

@@ -22,7 +22,8 @@ extern const char* g_strHIT_WALL_SOUND;
class LegoPathActor : public LegoActor {
public:
enum {
c_bit3 = 0x04
c_bit3 = 0x04,
c_bit9 = 0x100
};
LegoPathActor();