Implement/match LegoAnimationManager::FUN_10060dc0 (#856)

* Implement/match LegoAnimationManager::FUN_10060dc0

* Fix params
This commit is contained in:
Christian Semmler
2024-04-26 11:37:07 -04:00
committed by GitHub
parent 19d39394be
commit 53ef6bdd81
5 changed files with 105 additions and 41 deletions

View File

@@ -15,19 +15,19 @@ struct ModelInfo {
// SIZE 0x30
struct AnimInfo {
char* m_animName; // 0x00
undefined4 m_unk0x04; // 0x04
MxS16 m_unk0x08; // 0x08
MxU8 m_unk0x0a; // 0x0a
MxU8 m_unk0x0b; // 0x0b
MxU8 m_unk0x0c; // 0x0c
MxU8 m_unk0x0d; // 0x0d
MxU32 m_unk0x10[4]; // 0x10
MxU8 m_modelCount; // 0x20
ModelInfo* m_models; // 0x24
MxU8 m_unk0x28; // 0x28
MxU8 m_unk0x29; // 0x29
MxS8 m_unk0x2a[3]; // 0x2a
char* m_animName; // 0x00
MxU32 m_objectId; // 0x04
MxS16 m_unk0x08; // 0x08
MxU8 m_unk0x0a; // 0x0a
MxU8 m_unk0x0b; // 0x0b
MxU8 m_unk0x0c; // 0x0c
MxU8 m_unk0x0d; // 0x0d
MxU32 m_unk0x10[4]; // 0x10
MxU8 m_modelCount; // 0x20
ModelInfo* m_models; // 0x24
MxU8 m_unk0x28; // 0x28
MxU8 m_unk0x29; // 0x29
MxS8 m_unk0x2a[3]; // 0x2a
};
// VTABLE: LEGO1 0x100d8d80

View File

@@ -75,18 +75,17 @@ public:
MxResult ReadModelInfo(LegoFile* p_file, ModelInfo* p_info);
void DeleteAnimations();
void FUN_10060570(MxBool);
MxResult FUN_100609f0(MxU32 p_objectId, MxMatrix* p_matrix, MxBool p_und1, MxBool p_und2);
MxResult StartEntityAction(MxDSAction& p_dsAction, LegoEntity* p_entity);
undefined4 FUN_10060dc0(
IsleScript::Script,
undefined4,
undefined,
undefined,
undefined4,
undefined,
undefined,
undefined,
undefined
MxResult FUN_10060dc0(
IsleScript::Script p_objectId,
MxMatrix* p_matrix,
undefined p_param3,
undefined p_param4,
undefined4 p_param5,
undefined p_param6,
MxBool p_param7,
MxBool p_param8,
undefined p_param9
);
void FUN_10061010(undefined4);
void FUN_100617c0(MxS32, MxU16&, MxU32&);
@@ -107,6 +106,18 @@ public:
private:
void Init();
MxResult FUN_100605e0(
MxU32 p_index,
MxU8 p_unk0x0a,
MxMatrix* p_matrix,
undefined,
undefined4,
undefined,
MxBool,
MxBool,
undefined
);
MxResult FUN_100609f0(MxU32 p_objectId, MxMatrix* p_matrix, MxBool p_und1, MxBool p_und2);
MxU32 m_scriptIndex; // 0x08
MxU16 m_animCount; // 0x0c

View File

@@ -259,7 +259,9 @@ private:
MxDSAction m_action; // 0xa0
MxBackgroundAudioManager* m_bkgAudioManager; // 0x134
MxTransitionManager* m_transitionManager; // 0x138
MxBool m_unk0x13c; // 0x13c
public:
MxBool m_unk0x13c; // 0x13c
};
const char* GetNoCD_SourceName();