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,6 +1,6 @@
#include "carrace.h"
DECOMP_SIZE_ASSERT(CarRace, 0x154);
DECOMP_SIZE_ASSERT(CarRace, 0x154)
// FUNCTION: LEGO1 0x10016a90
CarRace::CarRace()

View File

@@ -1,5 +1,7 @@
#include "jetskirace.h"
DECOMP_SIZE_ASSERT(JetskiRace, 0x144)
// STUB: LEGO1 0x100162c0
MxResult JetskiRace::Create(MxDSAction& p_dsAction)
{

View File

@@ -1,11 +1,20 @@
#include "legoraceactor.h"
DECOMP_SIZE_ASSERT(LegoRaceActor, 0x180)
// STUB: LEGO1 0x10014190
void LegoRaceActor::VTable0x74(Matrix4& p_transform)
{
// TODO
}
// FUNCTION: LEGO1 0x100145d0
LegoRaceActor::LegoRaceActor()
{
m_unk0x70 = 0;
m_unk0x08 = 0;
}
// STUB: LEGO1 0x10014ca0
void LegoRaceActor::ParseAction(char*)
{

View File

@@ -1,5 +1,49 @@
#include "legoracecar.h"
#include "mxmisc.h"
#include "mxnotificationmanager.h"
DECOMP_SIZE_ASSERT(LegoRaceCar, 0x200)
// FUNCTION: LEGO1 0x10012950
LegoRaceCar::LegoRaceCar()
{
m_unk0x54 = 0;
m_unk0x70 = 0;
m_unk0x74 = 0;
m_unk0x5c.Clear();
m_unk0x58 = 0;
m_unk0x78 = 0;
m_unk0x7c = 0;
NotificationManager()->Register(this);
}
// FUNCTION: LEGO1 0x10012ea0
void LegoRaceCar::FUN_10012ea0(float p_worldSpeed)
{
if (p_worldSpeed < 0) {
LegoCarRaceActor::m_unk0x0c = 2;
m_unk0x13c = 0;
SetWorldSpeed(0);
}
else {
m_unk0x13c = p_worldSpeed;
}
}
// STUB: LEGO1 0x10012ff0
void LegoRaceCar::FUN_10012ff0(float)
{
// TODO
}
// STUB: LEGO1 0x10013130
MxBool LegoRaceCar::FUN_10013130(float)
{
// TODO
return TRUE;
}
// STUB: LEGO1 0x10014280
MxLong LegoRaceCar::Notify(MxParam& p_param)
{

View File

@@ -0,0 +1,21 @@
#include "legoracemap.h"
#include "legocontrolmanager.h"
#include "misc.h"
DECOMP_SIZE_ASSERT(LegoRaceMap, 0x1b4)
// FUNCTION: LEGO1 0x1005d0d0
LegoRaceMap::LegoRaceMap()
{
m_unk0x08 = FALSE;
m_unk0x0c = NULL;
m_unk0x10 = 0;
ControlManager()->Register(this);
}
// FUNCTION: LEGO1 0x1005d4b0
void LegoRaceMap::FUN_1005d4b0()
{
// TODO
}

View File

@@ -0,0 +1,9 @@
#include "raceskel.h"
DECOMP_SIZE_ASSERT(RaceSkel, 0x178)
// STUB: LEGO1 0x100719b0
RaceSkel::RaceSkel()
{
// TODO
}

View File

@@ -1 +1,3 @@
#include "racestandsentity.h"
DECOMP_SIZE_ASSERT(RaceStandsEntity, 0x68)