diff --git a/LEGO1/lego/legoomni/include/legoraceactor.h b/LEGO1/lego/legoomni/include/legoraceactor.h index 92f1e8c7..46423f95 100644 --- a/LEGO1/lego/legoomni/include/legoraceactor.h +++ b/LEGO1/lego/legoomni/include/legoraceactor.h @@ -5,40 +5,35 @@ class Matrix4; -/* - VTABLE: LEGO1 0x100d5b78 LegoAnimActor - VTABLE: LEGO1 0x100d5b88 LegoPathActor - VTABLE: LEGO1 0x100d5c54 LegoRaceActor -*/ +// VTABLE: LEGO1 0x100d5b78 LegoAnimActor +// VTABLE: LEGO1 0x100d5b88 LegoPathActor +// VTABLE: LEGO1 0x100d5c54 LegoRaceActor // SIZE 0x180 class LegoRaceActor : public virtual LegoAnimActor { public: LegoRaceActor(); - // FUNCTION: LEGO1 0x10014af0 + // FUNCTION: LEGO1 0x10014b00 inline const char* ClassName() const override // vtable+0x0c { // STRING: LEGO1 0x100f0bf4 return "LegoRaceActor"; } - // FUNCTION: LEGO1 0x10014b10 + // FUNCTION: LEGO1 0x10014b20 inline MxBool IsA(const char* p_name) const override // vtable+0x10 { return !strcmp(p_name, LegoRaceActor::ClassName()) || LegoAnimActor::IsA(p_name); } - void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30 MxS32 VTable0x68(Vector3&, Vector3&, Vector3&) override; // vtable+0x68 - void VTable0x70(float p_float) override; // vtable+0x70 - void VTable0x74(Matrix4& p_transform) override; // vtable+0x74 MxU32 VTable0x90(float, Matrix4&) override; // vtable+0x90 MxResult VTable0x94(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94 // FUNCTION: LEGO1 0x10014aa0 virtual MxResult FUN_10014aa0() { return SUCCESS; } - // SYNTHETIC: LEGO1 0x10014ab0 + // SYNTHETIC: LEGO1 0x10014ac0 // LegoRaceActor::`scalar deleting destructor' private: diff --git a/LEGO1/lego/legoomni/src/race/legoraceactor.cpp b/LEGO1/lego/legoomni/src/race/legoraceactor.cpp index 77f2a785..9bc47709 100644 --- a/LEGO1/lego/legoomni/src/race/legoraceactor.cpp +++ b/LEGO1/lego/legoomni/src/race/legoraceactor.cpp @@ -2,12 +2,6 @@ DECOMP_SIZE_ASSERT(LegoRaceActor, 0x180) -// STUB: LEGO1 0x10014190 -void LegoRaceActor::VTable0x74(Matrix4& p_transform) -{ - // TODO -} - // FUNCTION: LEGO1 0x100145d0 LegoRaceActor::LegoRaceActor() { @@ -15,33 +9,21 @@ LegoRaceActor::LegoRaceActor() m_unk0x08 = 0; } -// STUB: LEGO1 0x10014cb0 -void LegoRaceActor::SetWorldSpeed(MxFloat p_worldSpeed) -{ - // TODO -} - -// STUB: LEGO1 0x10014cc0 +// STUB: LEGO1 0x10014750 MxS32 LegoRaceActor::VTable0x68(Vector3&, Vector3&, Vector3&) { // TODO return 0; } -// STUB: LEGO1 0x10014cd0 -void LegoRaceActor::VTable0x70(float p_float) -{ - // TODO -} - -// STUB: LEGO1 0x10014ce0 +// STUB: LEGO1 0x100147f0 MxU32 LegoRaceActor::VTable0x90(float, Matrix4&) { // TODO return 0; } -// STUB: LEGO1 0x10014cf0 +// STUB: LEGO1 0x10014a00 MxResult LegoRaceActor::VTable0x94(LegoPathActor* p_actor, MxBool p_bool) { // TODO