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

@@ -0,0 +1,9 @@
#include "act2actor.h"
DECOMP_SIZE_ASSERT(Act2Actor, 0x1a8)
// STUB: LEGO1 0x100187e0
Act2Actor::Act2Actor()
{
// TODO
}

View File

@@ -0,0 +1,9 @@
#include "act3actor.h"
DECOMP_SIZE_ASSERT(Act3Actor, 0x178)
// STUB: LEGO1 0x1003fa50
Act3Actor::Act3Actor()
{
m_unk0x1c = 0;
}

View File

@@ -2,7 +2,7 @@
#include "decomp.h"
DECOMP_SIZE_ASSERT(Ambulance, 0x184);
DECOMP_SIZE_ASSERT(Ambulance, 0x184)
// FUNCTION: LEGO1 0x10035ee0
Ambulance::Ambulance()

View File

@@ -8,7 +8,7 @@
#include "legoworld.h"
#include "misc.h"
DECOMP_SIZE_ASSERT(Bike, 0x164);
DECOMP_SIZE_ASSERT(Bike, 0x164)
// FUNCTION: LEGO1 0x10076670
Bike::Bike()

View File

@@ -1,5 +1,7 @@
#include "bumpbouy.h"
DECOMP_SIZE_ASSERT(BumpBouy, 0x174)
// STUB: LEGO1 0x1000fd00
void BumpBouy::ParseAction(char*)
{
@@ -24,6 +26,11 @@ void BumpBouy::VTable0x74(Matrix4& p_transform)
// TODO
}
// STUB: LEGO1 0x10027220
BumpBouy::BumpBouy()
{
}
// STUB: LEGO1 0x100274d0
MxLong BumpBouy::Notify(MxParam& p_param)
{

View File

@@ -1,5 +1,7 @@
#include "doors.h"
DECOMP_SIZE_ASSERT(Doors, 0x1f8)
// STUB: LEGO1 0x10066100
MxS32 Doors::VTable0x94()
{

View File

@@ -2,7 +2,7 @@
#include "decomp.h"
DECOMP_SIZE_ASSERT(DuneBuggy, 0x16c);
DECOMP_SIZE_ASSERT(DuneBuggy, 0x16c)
// FUNCTION: LEGO1 0x10067bb0
DuneBuggy::DuneBuggy()

View File

@@ -1,6 +1,6 @@
#include "jetski.h"
DECOMP_SIZE_ASSERT(Jetski, 0x164);
DECOMP_SIZE_ASSERT(Jetski, 0x164)
// FUNCTION: LEGO1 0x1007e3b0
Jetski::Jetski()

View File

@@ -14,6 +14,8 @@
#include "mxnotificationmanager.h"
#include "mxtransitionmanager.h"
DECOMP_SIZE_ASSERT(JukeBoxEntity, 0x6c)
// FUNCTION: LEGO1 0x10085bc0
JukeBoxEntity::JukeBoxEntity()
{

View File

@@ -1,6 +1,6 @@
#include "motocycle.h"
DECOMP_SIZE_ASSERT(Motocycle, 0x16c);
DECOMP_SIZE_ASSERT(Motocycle, 0x16c)
// FUNCTION: LEGO1 0x100357b0
Motocycle::Motocycle()

View File

@@ -3,7 +3,7 @@
#include "mxmisc.h"
#include "mxticklemanager.h"
DECOMP_SIZE_ASSERT(Pizza, 0x9c);
DECOMP_SIZE_ASSERT(Pizza, 0x9c)
// FUNCTION: LEGO1 0x10037ef0
Pizza::Pizza()

View File

@@ -1,5 +1,7 @@
#include "pizzeria.h"
DECOMP_SIZE_ASSERT(Pizzeria, 0x84)
// STUB: LEGO1 0x100179c0
MxResult Pizzeria::Create(MxDSAction& p_dsAction)
{

View File

@@ -3,7 +3,7 @@
#include "legocontrolmanager.h"
#include "misc.h"
DECOMP_SIZE_ASSERT(RaceCar, 0x164);
DECOMP_SIZE_ASSERT(RaceCar, 0x164)
// FUNCTION: LEGO1 0x10028200
RaceCar::RaceCar()

View File

@@ -10,7 +10,7 @@
#include "mxmisc.h"
#include "mxnotificationmanager.h"
DECOMP_SIZE_ASSERT(Radio, 0x10);
DECOMP_SIZE_ASSERT(Radio, 0x10)
// FUNCTION: LEGO1 0x1002c850
Radio::Radio()

View File

@@ -4,7 +4,7 @@
#include "mxmisc.h"
#include "mxnotificationmanager.h"
DECOMP_SIZE_ASSERT(SkateBoard, 0x168);
DECOMP_SIZE_ASSERT(SkateBoard, 0x168)
// FUNCTION: LEGO1 0x1000fd40
SkateBoard::SkateBoard()

View File

@@ -1,6 +1,6 @@
#include "towtrack.h"
DECOMP_SIZE_ASSERT(TowTrack, 0x180);
DECOMP_SIZE_ASSERT(TowTrack, 0x180)
// FUNCTION: LEGO1 0x1004c720
TowTrack::TowTrack()