mirror of
https://github.com/isledecomp/isle.git
synced 2025-10-24 17:04:17 +00:00
Order functions in binary up to end of Act2Actor (#1312)
* Order more functions * Order LegoRaceActor * Further ordering * Order `Act2Actor` * Fix
This commit is contained in:
Christian Semmler
committed by
GitHub
GitHub
parent
72aa7e330d
commit
7c452e9453
@@ -25,81 +25,6 @@ struct SkeletonKickPhase {
|
||||
MxU8 m_userState; // 0x0c
|
||||
};
|
||||
|
||||
// VTABLE: LEGO1 0x100d58a0 LegoRaceActor
|
||||
// VTABLE: LEGO1 0x100d58a8 LegoAnimActor
|
||||
// VTABLE: LEGO1 0x100d58b8 LegoPathActor
|
||||
// VTABLE: LEGO1 0x100d5984 LegoRaceMap
|
||||
// VTABLE: LEGO1 0x100d5988 LegoCarRaceActor
|
||||
// VTABLE: BETA10 0x101be6ec LegoRaceActor
|
||||
// VTABLE: BETA10 0x101be6f0 LegoAnimActor
|
||||
// VTABLE: BETA10 0x101be708 LegoPathActor
|
||||
// VTABLE: BETA10 0x101be7f8 LegoRaceMap
|
||||
// VTABLE: BETA10 0x101be800 LegoCarRaceActor
|
||||
// SIZE 0x200
|
||||
class LegoRaceCar : public LegoCarRaceActor, public LegoRaceMap {
|
||||
public:
|
||||
LegoRaceCar();
|
||||
~LegoRaceCar() override;
|
||||
|
||||
MxLong Notify(MxParam& p_param) override; // vtable+0x04
|
||||
|
||||
// FUNCTION: LEGO1 0x100142a0
|
||||
// FUNCTION: BETA10 0x100cd500
|
||||
const char* ClassName() const override // vtable+0x0c
|
||||
{
|
||||
// STRING: LEGO1 0x100f0548
|
||||
return "LegoRaceCar";
|
||||
}
|
||||
|
||||
// FUNCTION: LEGO1 0x100142c0
|
||||
MxBool IsA(const char* p_name) const override // vtable+0x10
|
||||
{
|
||||
return !strcmp(p_name, LegoRaceCar::ClassName()) || LegoCarRaceActor::IsA(p_name);
|
||||
}
|
||||
|
||||
void ParseAction(char* p_extra) override; // vtable+0x20
|
||||
void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
|
||||
MxU32 VTable0x6c(
|
||||
LegoPathBoundary* p_boundary,
|
||||
Vector3& p_v1,
|
||||
Vector3& p_v2,
|
||||
float p_f1,
|
||||
float p_f2,
|
||||
Vector3& p_v3
|
||||
) override; // vtable+0x6c
|
||||
void Animate(float p_time) override; // vtable+0x70
|
||||
MxResult HitActor(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94
|
||||
void SwitchBoundary(LegoPathBoundary*& p_boundary, LegoUnknown100db7f4*& p_edge, float& p_unk0xe4)
|
||||
override; // vtable+0x98
|
||||
MxResult VTable0x9c() override; // vtable+0x9c
|
||||
|
||||
virtual void SetMaxLinearVelocity(float p_maxLinearVelocity);
|
||||
virtual void FUN_10012ff0(float p_param);
|
||||
virtual MxU32 HandleSkeletonKicks(float p_param1);
|
||||
|
||||
static void FUN_10012de0();
|
||||
static void FUN_10012e00();
|
||||
static void FUN_10013670();
|
||||
|
||||
// SYNTHETIC: LEGO1 0x10014240
|
||||
// LegoRaceCar::`scalar deleting destructor'
|
||||
|
||||
private:
|
||||
undefined m_userState; // 0x54
|
||||
float m_unk0x58; // 0x58
|
||||
Mx3DPointFloat m_unk0x5c; // 0x5c
|
||||
|
||||
// Names verified by BETA10 0x100cb4a9
|
||||
LegoAnimActorStruct* m_skelKick1Anim; // 0x70
|
||||
LegoAnimActorStruct* m_skelKick2Anim; // 0x74
|
||||
|
||||
// Name verified by BETA10 0x100cb4f0
|
||||
LegoPathBoundary* m_kick1B; // 0x78
|
||||
|
||||
// Name verified by BETA10 0x100cb537
|
||||
LegoPathBoundary* m_kick2B; // 0x7c
|
||||
};
|
||||
|
||||
// VTABLE: LEGO1 0x100d5a08 LegoCarRaceActor
|
||||
// VTABLE: LEGO1 0x100d5a28 LegoRaceActor
|
||||
// VTABLE: LEGO1 0x100d5a30 LegoAnimActor
|
||||
@@ -134,19 +59,25 @@ public:
|
||||
|
||||
void ParseAction(char* p_extra) override; // vtable+0x20
|
||||
void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
|
||||
MxU32 VTable0x6c(
|
||||
LegoPathBoundary* p_boundary,
|
||||
Vector3& p_v1,
|
||||
Vector3& p_v2,
|
||||
float p_f1,
|
||||
float p_f2,
|
||||
Vector3& p_v3
|
||||
) override; // vtable+0x6c
|
||||
|
||||
// FUNCTION: LEGO1 0x10014150
|
||||
MxU32 VTable0x6c(LegoPathBoundary* p_boundary, Vector3& p_v1, Vector3& p_v2, float p_f1, float p_f2, Vector3& p_v3)
|
||||
override
|
||||
{
|
||||
return LegoJetskiRaceActor::VTable0x6c(p_boundary, p_v1, p_v2, p_f1, p_f2, p_v3);
|
||||
} // vtable+0x6c
|
||||
|
||||
void Animate(float p_time) override; // vtable+0x70
|
||||
MxResult HitActor(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94
|
||||
void SwitchBoundary(LegoPathBoundary*& p_boundary, LegoUnknown100db7f4*& p_edge, float& p_unk0xe4)
|
||||
override; // vtable+0x98
|
||||
MxResult VTable0x9c() override; // vtable+0x9c
|
||||
|
||||
// FUNCTION: LEGO1 0x100141d0
|
||||
void SwitchBoundary(LegoPathBoundary*& p_boundary, LegoUnknown100db7f4*& p_edge, float& p_unk0xe4) override
|
||||
{
|
||||
LegoJetskiRaceActor::SwitchBoundary(p_boundary, p_edge, p_unk0xe4);
|
||||
} // vtable+0x98
|
||||
|
||||
// FUNCTION: LEGO1 0x10014210
|
||||
MxResult VTable0x9c() override { return LegoJetskiRaceActor::VTable0x9c(); } // vtable+0x9c
|
||||
|
||||
virtual void FUN_100136f0(float p_worldSpeed);
|
||||
|
||||
@@ -154,6 +85,88 @@ public:
|
||||
// LegoJetski::`scalar deleting destructor'
|
||||
};
|
||||
|
||||
// VTABLE: LEGO1 0x100d58a0 LegoRaceActor
|
||||
// VTABLE: LEGO1 0x100d58a8 LegoAnimActor
|
||||
// VTABLE: LEGO1 0x100d58b8 LegoPathActor
|
||||
// VTABLE: LEGO1 0x100d5984 LegoRaceMap
|
||||
// VTABLE: LEGO1 0x100d5988 LegoCarRaceActor
|
||||
// VTABLE: BETA10 0x101be6ec LegoRaceActor
|
||||
// VTABLE: BETA10 0x101be6f0 LegoAnimActor
|
||||
// VTABLE: BETA10 0x101be708 LegoPathActor
|
||||
// VTABLE: BETA10 0x101be7f8 LegoRaceMap
|
||||
// VTABLE: BETA10 0x101be800 LegoCarRaceActor
|
||||
// SIZE 0x200
|
||||
class LegoRaceCar : public LegoCarRaceActor, public LegoRaceMap {
|
||||
public:
|
||||
LegoRaceCar();
|
||||
~LegoRaceCar() override;
|
||||
|
||||
MxLong Notify(MxParam& p_param) override; // vtable+0x04
|
||||
|
||||
// FUNCTION: LEGO1 0x100142a0
|
||||
// FUNCTION: BETA10 0x100cd500
|
||||
const char* ClassName() const override // vtable+0x0c
|
||||
{
|
||||
// STRING: LEGO1 0x100f0548
|
||||
return "LegoRaceCar";
|
||||
}
|
||||
|
||||
// FUNCTION: LEGO1 0x100142c0
|
||||
MxBool IsA(const char* p_name) const override // vtable+0x10
|
||||
{
|
||||
return !strcmp(p_name, LegoRaceCar::ClassName()) || LegoCarRaceActor::IsA(p_name);
|
||||
}
|
||||
|
||||
void ParseAction(char* p_extra) override; // vtable+0x20
|
||||
void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
|
||||
|
||||
// FUNCTION: LEGO1 0x10014500
|
||||
// FUNCTION: BETA10 0x100cd5e0
|
||||
MxU32 VTable0x6c(LegoPathBoundary* p_boundary, Vector3& p_v1, Vector3& p_v2, float p_f1, float p_f2, Vector3& p_v3)
|
||||
override
|
||||
{
|
||||
return LegoCarRaceActor::VTable0x6c(p_boundary, p_v1, p_v2, p_f1, p_f2, p_v3);
|
||||
} // vtable+0x6c
|
||||
|
||||
void Animate(float p_time) override; // vtable+0x70
|
||||
MxResult HitActor(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94
|
||||
|
||||
// FUNCTION: LEGO1 0x10014560
|
||||
// FUNCTION: BETA10 0x100cd660
|
||||
void SwitchBoundary(LegoPathBoundary*& p_boundary, LegoUnknown100db7f4*& p_edge, float& p_unk0xe4) override
|
||||
{
|
||||
LegoCarRaceActor::SwitchBoundary(p_boundary, p_edge, p_unk0xe4);
|
||||
} // vtable+0x98
|
||||
|
||||
MxResult VTable0x9c() override; // vtable+0x9c
|
||||
|
||||
virtual void SetMaxLinearVelocity(float p_maxLinearVelocity);
|
||||
virtual void FUN_10012ff0(float p_param);
|
||||
virtual MxU32 HandleSkeletonKicks(float p_param1);
|
||||
|
||||
static void FUN_10012de0();
|
||||
static void FUN_10012e00();
|
||||
static void FUN_10013670();
|
||||
|
||||
// SYNTHETIC: LEGO1 0x10014240
|
||||
// LegoRaceCar::`scalar deleting destructor'
|
||||
|
||||
private:
|
||||
undefined m_userState; // 0x54
|
||||
float m_unk0x58; // 0x58
|
||||
Mx3DPointFloat m_unk0x5c; // 0x5c
|
||||
|
||||
// Names verified by BETA10 0x100cb4a9
|
||||
LegoAnimActorStruct* m_skelKick1Anim; // 0x70
|
||||
LegoAnimActorStruct* m_skelKick2Anim; // 0x74
|
||||
|
||||
// Name verified by BETA10 0x100cb4f0
|
||||
LegoPathBoundary* m_kick1B; // 0x78
|
||||
|
||||
// Name verified by BETA10 0x100cb537
|
||||
LegoPathBoundary* m_kick2B; // 0x7c
|
||||
};
|
||||
|
||||
// GLOBAL: LEGO1 0x100d5890
|
||||
// LegoRaceCar::`vbtable'{for `LegoCarRaceActor'}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user