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

@@ -170,7 +170,7 @@ LegoROI* LegoCharacterManager::GetROI(const char* p_key, MxBool p_createEntity)
if (character != NULL) {
if (p_createEntity && character->m_roi->GetEntity() == NULL) {
// TODO: Match
LegoAnimActor* actor = new LegoAnimActor(1);
LegoAnimActor* actor = new LegoAnimActor();
actor->SetROI(character->m_roi, FALSE, FALSE);
actor->FUN_100114e0(0);

View File

@@ -34,6 +34,7 @@ DECOMP_SIZE_ASSERT(LegoGameState::Username, 0x0e)
DECOMP_SIZE_ASSERT(LegoGameState::ScoreItem, 0x2c)
DECOMP_SIZE_ASSERT(LegoGameState::History, 0x374)
DECOMP_SIZE_ASSERT(LegoGameState, 0x430)
DECOMP_SIZE_ASSERT(ColorStringStruct, 0x08)
// GLOBAL: LEGO1 0x100f3e40
// STRING: LEGO1 0x100f3e3c

View File

@@ -1,5 +1,7 @@
#include "legoobjectfactory.h"
#include "act2actor.h"
#include "act2brick.h"
#include "carrace.h"
#include "decomp.h"
#include "dunebuggy.h"
@@ -56,8 +58,6 @@
#include "score.h"
#include "scorestate.h"
#include "skateboard.h"
// #include "act2actor.h"
#include "act2brick.h"
// #include "act2genactor.h"
#include "act2policestation.h"
#include "act3.h"
@@ -77,6 +77,7 @@
#include "act1state.h"
#include "act3actor.h"
#include "act3shark.h"
#include "animstate.h"
#include "beachhouseentity.h"
#include "bumpbouy.h"
#include "carracestate.h"
@@ -93,10 +94,9 @@
#include "pizzeria.h"
#include "pizzeriastate.h"
#include "policeentity.h"
#include "raceskel.h"
#include "racestandsentity.h"
#include "radiostate.h"
// #include "raceskel.h"
#include "animstate.h"
// TODO: Before HospitalState, add all of the different LegoVehicleBuildState's

View File

@@ -6,7 +6,7 @@
#include "misc/legotexture.h"
#include "tgl/d3drm/impl.h"
DECOMP_SIZE_ASSERT(LegoTextureInfo, 0x10);
DECOMP_SIZE_ASSERT(LegoTextureInfo, 0x10)
// FUNCTION: LEGO1 0x10065bf0
LegoTextureInfo::LegoTextureInfo()

View File

@@ -11,7 +11,7 @@
#include "mxticklemanager.h"
#include "mxvideopresenter.h"
DECOMP_SIZE_ASSERT(MxTransitionManager, 0x900);
DECOMP_SIZE_ASSERT(MxTransitionManager, 0x900)
// GLOBAL: LEGO1 0x100f4378
RECT g_fullScreenRect = {0, 0, 640, 480};