Fix Annotations and LegoAnimActor class structure. (#710)

* Fix size annotations for legoomni
Fix structure and add placeholder annotations for LegoAnimActor and subclasses

* Fix LegoCarRaceActor constructor
Fix function name in LegoRaceCar

* Add size assertions for legoomni and fix sizes

* Various style fixes

* Use other marker so vtable.py doesn't compare

* Revert "Use other marker so vtable.py doesn't compare"

This reverts commit 608985cd73.

* Fix copy/paste error

* Remove stale comment.

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Nathan M Gilbert
2024-03-22 21:30:58 -04:00
committed by GitHub
parent 96f7219811
commit fca8f74bd8
108 changed files with 778 additions and 82 deletions

View File

@@ -1,13 +1,21 @@
#ifndef LEGOCARRACE_H
#define LEGOCARRACE_H
#ifndef LEGORACECAR_H
#define LEGORACECAR_H
#include "legocarraceactor.h"
#include "legopathactor.h"
#include "legoracemap.h"
// VTABLE: LEGO1 0x100d58b8
/*
VTABLE: LEGO1 0x100d58a0 LegoRaceActor
VTABLE: LEGO1 0x100d58a8 LegoAnimActor
VTABLE: LEGO1 0x100d58b8 LegoPathActor
VTABLE: LEGO1 0x100d5894 LegoRaceMap
VTABLE: LEGO1 0x100d5898 LegoCarRaceActor
*/
// SIZE 0x200
class LegoRaceCar : public LegoCarRaceActor {
class LegoRaceCar : public LegoCarRaceActor, public LegoRaceMap {
public:
LegoRaceCar();
MxLong Notify(MxParam& p_param) override; // vtable+0x04
// FUNCTION: LEGO1 0x10014290
@@ -31,8 +39,21 @@ public:
void VTable0x98() override; // vtable+0x98
void VTable0x9c() override; // vtable+0x9c
virtual void FUN_10012ea0(float p_worldSpeed);
virtual void FUN_10012ff0(float);
virtual MxBool FUN_10013130(float);
// SYNTHETIC: LEGO1 0x10014230
// LegoRaceCar::`scalar deleting destructor'
private:
undefined m_unk0x54; // 0x54
undefined4 m_unk0x58; // 0x58
Mx3DPointFloat m_unk0x5c; // 0x5c
undefined4 m_unk0x70; // 0x70
undefined4 m_unk0x74; // 0x74
undefined4 m_unk0x78; // 0x78
undefined4 m_unk0x7c; // 0x7c
};
#endif // LEGOCARRACE_H
#endif // LEGORACECAR_H