mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Annotations and LegoAnimActor class structure. (#710)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

22
LEGO1/lego/legoomni/include/act2actor.h Normal file
View File

@@ -0,0 +1,22 @@
#ifndef ACT2ACTOR_H
#define ACT2ACTOR_H
#include "legoanimactor.h"
/*
VTABLE: LEGO1 0x100d6078 LegoPathActor
VTABLE: LEGO1 0x100d6148 LegoAnimActor
*/
// SIZE 0x1a8
class Act2Actor : public LegoAnimActor {
public:
Act2Actor();
// SYNTHETIC: LEGO1 0x1001a090
// Act2Actor::`scalar deleting destructor'
private:
undefined m_unk0x1c[0x34]; // 0x1c
};
#endif // ACT2ACTOR_H

8
LEGO1/lego/legoomni/include/act2brick.h
View File

@@ -30,6 +30,14 @@ public:
// SYNTHETIC: LEGO1 0x1007a450
// Act2Brick::`scalar deleting destructor'
private:
undefined4 m_unk0x154; // 0x154
undefined m_unk0x158[0x0c]; // 0x158
undefined4 m_unk0x164; // 0x164
Mx3DPointFloat m_unk0x168; // 0x168
Mx3DPointFloat m_unk0x17c; // 0x17c
undefined4 m_unk0x190; // 0x190
};
#endif // ACT2BRICK_H

18
LEGO1/lego/legoomni/include/act3actor.h
View File

@@ -1,18 +1,26 @@
#ifndef ACT3ACTOR_H
#define ACT3ACTOR_H
#include "mxcore.h"
#include "legoanimactor.h"
// FIXME: Uncertain location. There are three vtables which eventually call this
// class' ClassName() function, but none of them call it directly.
class Act3Actor : public MxCore {
/*
VTABLE: LEGO1 0x100d7668 LegoPathActor
VTABLE: LEGO1 0x100d7738 LegoAnimActor
*/
// SIZE 0x178
class Act3Actor : public LegoAnimActor {
public:
// FUNCTION: LEGO1 0x100431b0
Act3Actor();
// FUNCTION: LEGO1 0x100433b0
inline const char* ClassName() const override
{
// STRING: LEGO1 0x100f03ac
return "Act3Actor";
}
private:
undefined4 m_unk0x1c; // 0x1c
};
#endif // ACT3ACTOR_H

17
LEGO1/lego/legoomni/include/act3shark.h
View File

@@ -3,9 +3,15 @@
#include "legoanimactor.h"
// VTABLE: LEGO1 0x100d7920
/*
VTABLE: LEGO1 0x100d7920 LegoPathActor
VTABLE: LEGO1 0x100d79f0 LegoAnimActor
*/
// SIZE 0x1a8
class Act3Shark : public LegoAnimActor {
public:
Act3Shark();
// FUNCTION: LEGO1 0x100430c0
inline const char* ClassName() const override // vtable+0x0c
{
@@ -24,8 +30,17 @@ public:
void VTable0x70(float p_float) override; // vtable+0x70
void VTable0x74(Matrix4& p_transform) override; // vtable+0x74
virtual MxResult FUN_10042ce0(void*);
// SYNTHETIC: LEGO1 0x10043020
// Act3Shark::`scalar deleting destructor'
private:
list<void*> m_unk0x1c; // 0x1c
undefined4 m_unk0x28; // 0x28
undefined4 m_unk0x2c; // 0x2c
undefined m_unk0x30[0x0c]; // 0x30
Mx3DPointFloat m_unk0x3c; // 0x3c
};
#endif // ACT3SHARK_H

2
LEGO1/lego/legoomni/include/buildingentity.h
View File

@@ -4,7 +4,7 @@
#include "legoentity.h"
// VTABLE: LEGO1 0x100d5c88
// SIZE <= 0x68, hard to tell because it's always constructed as a derivative
// SIZE 0x68
class BuildingEntity : public LegoEntity {
public:
BuildingEntity();

7
LEGO1/lego/legoomni/include/bumpbouy.h
View File

@@ -4,9 +4,14 @@
#include "legoanimactor.h"
#include "mxtypes.h"
// VTABLE: LEGO1 0x100d6790
/*
VTABLE: LEGO1 0x100d6790 LegoPathActor
VTABLE: LEGO1 0x100d6860 LegoAnimActor
*/
// SIZE 0x174
class BumpBouy : public LegoAnimActor {
public:
BumpBouy();
MxLong Notify(MxParam& p_param) override; // vtable+0x04
// FUNCTION: LEGO1 0x100274e0

9
LEGO1/lego/legoomni/include/doors.h
View File

@@ -26,6 +26,15 @@ public:
// SYNTHETIC: LEGO1 0x1000e580
// Doors::`scalar deleting destructor'
private:
undefined4 m_unk0x154; // 0x154
undefined4 m_unk0x158; // 0x158
undefined4 m_unk0x15c; // 0x15c
undefined4 m_unk0x160; // 0x160
MxMatrix m_unk0x164; // 0x164
MxMatrix m_unk0x1ac; // 0x1ac
undefined4 m_unk0x1f4; // 0x1f4
};
#endif // DOORS_H

2
LEGO1/lego/legoomni/include/elevatorbottom.h
View File

@@ -8,7 +8,7 @@
class LegoControlManagerEvent;
// VTABLE: LEGO1 0x100d5f20
// SIZE: 0xfc (from inlined ctor at 0x1000a8aa)
// SIZE 0xfc
class ElevatorBottom : public LegoWorld {
public:
ElevatorBottom();

1
LEGO1/lego/legoomni/include/isleactor.h
View File

@@ -4,6 +4,7 @@
#include "legoactor.h"
// VTABLE: LEGO1 0x100d5178
// SIZE 0x78
class IsleActor : public LegoActor {
public:
MxLong Notify(MxParam& p_param) override; // vtable+0x04

27
LEGO1/lego/legoomni/include/legoact2.h
View File

@@ -1,6 +1,7 @@
#ifndef LEGOACT2_H
#define LEGOACT2_H
#include "act2brick.h"
#include "legocarraceactor.h"
#include "legopathactor.h"
#include "legoworld.h"
@@ -8,7 +9,7 @@
// VTABLE: LEGO1 0x100d82e0
// SIZE 0x1154
class LegoAct2 : public LegoWorld {
public:
MxLong Notify(MxParam& p_param) override; // vtable+0x04
MxResult Tickle() override; // vtable+0x08
MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18
@@ -20,6 +21,30 @@ class LegoAct2 : public LegoWorld {
// SYNTHETIC: LEGO1 0x1004fe20
// LegoAct2::`scalar deleting destructor'
private:
Act2Brick m_bricks[10]; // 0x00f8
undefined m_unk0x10c0; // 0x10c0
undefined m_unk0x10c1; // 0x10c1
undefined m_unk0x10c2; // 0x10c2
undefined4 m_unk0x10c4; // 0x10c4
undefined4 m_unk0x10c8; // 0x10c8
undefined4 m_unk0x10cc; // 0x10cc
undefined4 m_unk0x10d0; // 0x10d0
char* m_unk0x10d4; // 0x10d4
undefined4 m_unk0x10d8; // 0x10d8
MxMatrix m_unk0x10dc; // 0x10dc
undefined4 m_unk0x1124; // 0x1124
undefined4 m_unk0x1128; // 0x1128
undefined4 m_unk0x112c; // 0x112c
undefined4 m_unk0x1130; // 0x1130
undefined4 m_unk0x1134; // 0x1134
undefined4 m_unk0x1138; // 0x1138
undefined m_unk0x113c; // 0x113c
undefined4 m_unk0x1140; // 0x1140
undefined4 m_unk0x1144; // 0x1144
undefined m_unk0x1148[0x08]; // 0x1148
undefined4 m_unk0x1150; // 0x1150
};
#endif // LEGOACT2_H

2
LEGO1/lego/legoomni/include/legoactor.h
View File

@@ -48,7 +48,7 @@ public:
static const char* GetActorName(MxU8 p_id);
private:
protected:
MxFloat m_unk0x68; // 0x68
LegoCacheSound* m_sound; // 0x6c
MxFloat m_unk0x70; // 0x70

35
LEGO1/lego/legoomni/include/legoanimactor.h
View File

@@ -4,10 +4,39 @@
#include "decomp.h"
#include "legopathactor.h"
class LegoAnimActor : public LegoPathActor {
/*
VTABLE: LEGO1 0x100d5440 LegoPathActor
VTABLE: LEGO1 0x100d5510 LegoAnimActor
*/
// SIZE 0x174
class LegoAnimActor : public virtual LegoPathActor {
public:
LegoAnimActor() {}
LegoAnimActor(undefined4);
LegoAnimActor() { m_index = -1; }
// FUNCTION: LEGO1 0x1000fb90
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f057c
return "LegoAnimActor";
}
// FUNCTION: LEGO1 0x1000fbb0
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, LegoAnimActor::ClassName()) || LegoPathActor::IsA(p_name);
}
virtual MxResult FUN_1001c1f0(float& p_out);
virtual MxResult FUN_1001c360(float, undefined4);
virtual MxResult FUN_1001c450(undefined4, undefined4, undefined4, undefined4);
virtual void FUN_1001c800();
// SYNTHETIC: LEGO1 0x1000fb50
// LegoAnimActor::`scalar deleting destructor'
private:
vector<void*> m_unk0x08; // 0x08
MxU16 m_index; // 0x18
};
#endif // LEGOANIMACTOR_H

3
LEGO1/lego/legoomni/include/legoanimpresenter.h
View File

@@ -10,7 +10,7 @@ class LegoWorld;
class LegoAnimClass;
// VTABLE: LEGO1 0x100d90c8
// SIZE 0xc0
// SIZE 0xbc
class LegoAnimPresenter : public MxVideoPresenter {
public:
enum {
@@ -93,7 +93,6 @@ protected:
undefined4 m_unk0xa0; // 0xa0
undefined4 m_unk0xa4; // 0xa4
Mx3DPointFloat m_unk0xa8; // 0xa8
undefined4 m_unk0xbc; // 0xbc
};
// SYNTHETIC: LEGO1 0x10068650

53
LEGO1/lego/legoomni/include/legocarbuild.h
View File

@@ -34,6 +34,59 @@ public:
// SYNTHETIC: LEGO1 0x10022a60
// LegoCarBuild::`scalar deleting destructor'
private:
undefined4 m_unk0xf8; // 0xf8
undefined m_unk0xfc[0x8]; // 0xfc
undefined4 m_unk0x104; // 0x104
undefined m_unk0x108; // 0x108
undefined m_unk0x109; // 0x109
undefined4 m_unk0x10c; // 0x10c
undefined4 m_unk0x110; // 0x110
Mx3DPointFloat m_unk0x114; // 0x114
undefined4 m_unk0x128; // 0x128
MxMatrix m_unk0x12c; // 0x12c
undefined m_unk0x174; // 0x174
MxMatrix m_unk0x178; // 0x178
MxMatrix m_unk0x1c0; // 0x1c0
MxMatrix m_unk0x208; // 0x208
undefined m_unk0x250[0x08]; // 0x250
undefined4 m_unk0x258; // 0x258
Mx4DPointFloat m_unk0x25c; // 0x25c
Mx4DPointFloat m_unk0x274; // 0x274
undefined m_unk0x28c[0x18]; // 0x28c
Mx4DPointFloat m_unk0x2a4; // 0x2a4
Mx4DPointFloat m_unk0x2bc; // 0x2bc
undefined m_unk0x2d4; // 0x2d4
undefined4 m_unk0x2dc; // 0x2dc
undefined4 m_unk0x2e0; // 0x2e0
undefined4 m_unk0x2e4; // 0x2e4
undefined4 m_unk0x2e8; // 0x2e8
undefined4 m_unk0x2ec; // 0x2ec
undefined4 m_unk0x2f0; // 0x2f0
undefined4 m_unk0x2f4; // 0x2f4
undefined4 m_unk0x2f8; // 0x2f8
undefined4 m_unk0x2fc; // 0x2fc
undefined4 m_unk0x300; // 0x300
undefined4 m_unk0x304; // 0x304
undefined4 m_unk0x308; // 0x308
undefined4 m_unk0x30c; // 0x30c
undefined4 m_unk0x310; // 0x310
undefined4 m_unk0x314; // 0x314
undefined4 m_unk0x318; // 0x318
undefined4 m_unk0x31c; // 0x31c
undefined4 m_unk0x320; // 0x320
undefined4 m_unk0x324; // 0x324
undefined4 m_unk0x328; // 0x328
undefined4 m_unk0x2d8; // 0x2d8
undefined4 m_unk0x32c; // 0x32c
undefined4 m_unk0x330; // 0x330
undefined4 m_unk0x334; // 0x334
undefined4 m_unk0x338; // 0x338
undefined4 m_unk0x33c; // 0x33c
undefined4 m_unk0x340; // 0x340
undefined4 m_unk0x344; // 0x344
undefined4 m_unk0x348; // 0x348
};
#endif // LEGOCARBUILD_H

18
LEGO1/lego/legoomni/include/legocarbuildanimpresenter.h
View File

@@ -31,6 +31,24 @@ public:
// SYNTHETIC: LEGO1 0x10078660
// LegoCarBuildAnimPresenter::`scalar deleting destructor'
private:
undefined2 m_unk0xbc; // 0xbc
undefined2 m_unk0xbe; // 0xbe
undefined2 m_unk0xc0; // 0xc0
undefined4 m_unk0xc4; // 0xc4
LegoAnim m_unk0xc8; // 0xc8
MxMatrix m_unk0xe0; // 0xe0
undefined4 m_unk0x128; // 0x128
undefined4 m_unk0x12c; // 0x12c
undefined4 m_unk0x130; // 0x130
undefined4 m_unk0x134; // 0x134
undefined4 m_unk0x138; // 0x138
undefined4 m_unk0x13c; // 0x13c
undefined4 m_unk0x140; // 0x140
MxS32 m_unk0x144; // 0x144
MxS32 m_unk0x148; // 0x148
undefined4 m_unk0x14c; // 0x14c
};
#endif // LEGOCARBUILDANIMPRESENTER_H

42
LEGO1/lego/legoomni/include/legocarraceactor.h
View File

@@ -3,9 +3,17 @@
#include "legoraceactor.h"
// VTABLE: LEGO1 0x100da0d8
class LegoCarRaceActor : public LegoRaceActor {
/*
VTABLE: LEGO1 0x100da0c0 LegoRaceActor
VTABLE: LEGO1 0x100da0c8 LegoAnimActor
VTABLE: LEGO1 0x100da0d8 LegoPathActor
VTABLE: LEGO1 0x100da1a8 LegoCarRaceActor
*/
// SIZE 0x1a0
class LegoCarRaceActor : public virtual LegoRaceActor {
public:
LegoCarRaceActor();
// FUNCTION: LEGO1 0x10081650
inline const char* ClassName() const override // vtable+0x0c
{
@@ -27,8 +35,38 @@ public:
void VTable0x98() override; // vtable+0x98
void VTable0x9c() override; // vtable+0x9c
virtual void FUN_10080590();
// FUNCTION: LEGO1 0x10012bb0
virtual void FUN_10012bb0(float p_unk0x14) { m_unk0x14 = p_unk0x14; }
// FUNCTION: LEGO1 0x10012bc0
virtual float FUN_10012bc0() { return m_unk0x14; }
// FUNCTION: LEGO1 0x10012bd0
virtual void FUN_10012bd0(float p_unk0x10) { m_unk0x10 = p_unk0x10; }
// FUNCTION: LEGO1 0x10012be0
virtual float FUN_10012be0() { return m_unk0x10; }
// FUNCTION: LEGO1 0x10012bf0
virtual void FUN_10012bf0(float p_unk0x18) { m_unk0x18 = p_unk0x18; }
// FUNCTION: LEGO1 0x10012c00
virtual float FUN_10012c00() { return m_unk0x18; }
virtual void VTable0x1c(); // vtable+0x1c
// SYNTHETIC: LEGO1 0x10081610
// LegoCarRaceActor::`scalar deleting destructor'
protected:
float m_unk0x08; // 0x08
MxU8 m_unk0x0c; // 0x0c
float m_unk0x10; // 0x10
float m_unk0x14; // 0x14
float m_unk0x18; // 0x18
undefined4 m_unk0x1c; // 0x1c
};
#endif // LEGOCARRACEACTOR_H

24
LEGO1/lego/legoomni/include/legoextraactor.h
View File

@@ -3,9 +3,16 @@
#include "legoanimactor.h"
// VTABLE: LEGO1 0x100d6c10
class LegoExtraActor : public LegoAnimActor {
/*
VTABLE: LEGO1 0x100d6c00 LegoAnimActor
VTABLE: LEGO1 0x100d6c10 LegoPathActor
VTABLE: LEGO1 0x100d6cdc LegoExtraActor
*/
// SIZE 0x1dc
class LegoExtraActor : public virtual LegoAnimActor {
public:
LegoExtraActor();
// FUNCTION: LEGO1 0x1002b7a0
inline const char* ClassName() const override // vtable+0x0c
{
@@ -18,6 +25,19 @@ public:
{
return !strcmp(p_name, LegoExtraActor::ClassName()) || LegoAnimActor::IsA(p_name);
}
virtual MxResult FUN_1002aae0();
private:
undefined4 m_unk0x08; // 0x08
undefined m_unk0x0c; // 0x0c
undefined m_unk0x0d; // 0x0d
undefined m_unk0x0e; // 0x0e
undefined4 m_unk0x10; // 0x10
undefined m_unk0x14; // 0x14
MxMatrix m_unk0x18; // 0x18
undefined4 m_unk0x60; // 0x60
undefined4 m_unk0x64; // 0x64
};
#endif // LEGOEXTRAACTOR_H

5
LEGO1/lego/legoomni/include/legogamestate.h
View File

@@ -13,9 +13,10 @@ class LegoState;
class MxVariable;
class MxString;
// SIZE 0x08
struct ColorStringStruct {
const char* m_targetName;
const char* m_colorName;
const char* m_targetName; // 0x00
const char* m_colorName; // 0x04
};
// SIZE 0x430

16
LEGO1/lego/legoomni/include/legojetski.h
View File

@@ -2,10 +2,20 @@
#define LEGOJETSKI_H
#include "legojetskiraceactor.h"
#include "legoracemap.h"
// VTABLE: LEGO1 0x100d5a40
class LegoJetski : public LegoJetskiRaceActor {
/*
VTABLE: LEGO1 0x100d5a08 LegoJetskiRaceActor
VTABLE: LEGO1 0x100d5a28 LegoRaceActor
VTABLE: LEGO1 0x100d5a30 LegoAnimActor
VTABLE: LEGO1 0x100d5a40 LegoPathActor
VTABLE: LEGO1 0x100d5b10 LegoRaceMap
*/
// SIZE 0x1dc
class LegoJetski : public LegoJetskiRaceActor, public LegoRaceMap {
public:
LegoJetski();
MxLong Notify(MxParam& p_param) override; // vtable+0x04
// FUNCTION: LEGO1 0x10013e80
@@ -29,6 +39,8 @@ public:
void VTable0x98() override; // vtable+0x98
void VTable0x9c() override; // vtable+0x9c
virtual void FUN_100136f0(float p_worldSpeed);
// SYNTHETIC: LEGO1 0x10013e20
// LegoJetski::`scalar deleting destructor'
};

13
LEGO1/lego/legoomni/include/legojetskiraceactor.h
View File

@@ -3,9 +3,17 @@
#include "legocarraceactor.h"
// VTABLE: LEGO1 0x100da240
class LegoJetskiRaceActor : public LegoCarRaceActor {
/*
VTABLE: LEGO1 0x100da208 LegoCarRaceActor
VTABLE: LEGO1 0x100da228 LegoRaceActor
VTABLE: LEGO1 0x100da230 LegoAnimActor
VTABLE: LEGO1 0x100da240 LegoPathActor
*/
// SIZE 0x1a8
class LegoJetskiRaceActor : public virtual LegoCarRaceActor {
public:
LegoJetskiRaceActor();
// FUNCTION: LEGO1 0x10081d80
inline const char* ClassName() const override // vtable+0x0c
{
@@ -23,6 +31,7 @@ public:
void VTable0x70(float p_float) override; // vtable+0x70
void VTable0x98() override; // vtable+0x98
void VTable0x9c() override; // vtable+0x9c
void VTable0x1c() override; // vtable+0x1c
// SYNTHETIC: LEGO1 0x10081d40
// LegoJetskiRaceActor::`scalar deleting destructor'

5
LEGO1/lego/legoomni/include/legoloopinganimpresenter.h
View File

@@ -4,7 +4,7 @@
#include "legoanimpresenter.h"
// VTABLE: LEGO1 0x100d4900
// SIZE 0xc0 (discovered through inlined constructor at 0x10009ecd)
// SIZE 0xc0
class LegoLoopingAnimPresenter : public LegoAnimPresenter {
public:
// FUNCTION: LEGO1 0x1000c9a0
@@ -22,6 +22,9 @@ public:
void StreamingTickle() override; // vtable+0x20
void PutFrame() override; // vtable+0x6c
private:
undefined4 m_unk0xbc; // 0xbc
};
// SYNTHETIC: LEGO1 0x1006d000

2
LEGO1/lego/legoomni/include/legometerpresenter.h
View File

@@ -4,7 +4,7 @@
#include "mxstillpresenter.h"
// VTABLE: LEGO1 0x100d7ac8
// SIZE 0x94 (from 0x1000a163)
// SIZE 0x94
class LegoMeterPresenter : public MxStillPresenter {
public:
LegoMeterPresenter();

2
LEGO1/lego/legoomni/include/legomodelpresenter.h
View File

@@ -9,7 +9,7 @@ class LegoEntity;
class MxDSChunk;
// VTABLE: LEGO1 0x100d4e50
// SIZE 0x6c (discovered through inline constructor at 0x10009ae6)
// SIZE 0x6c
class LegoModelPresenter : public MxVideoPresenter {
public:
LegoModelPresenter() { Reset(); }

7
LEGO1/lego/legoomni/include/legoobjectfactory.h
View File

@@ -59,8 +59,8 @@
X(DuneBuggy) \
X(Pizza) \
X(PizzaMissionState) \
/*X(Act2Actor)*/ \
/*X(Act2Brick)*/ \
X(Act2Actor) \
X(Act2Brick) \
/*X(Act2GenActor)*/ \
X(Act2PoliceStation) \
X(Act3) \
@@ -98,10 +98,11 @@
X(MxCompositeMediaPresenter) \
X(JukeBox) \
X(JukeBoxState) \
/*X(RaceSkel)*/ \
X(RaceSkel) \
X(AnimState)
// VTABLE: LEGO1 0x100d4768
// SIZE 0x1c8
class LegoObjectFactory : public MxObjectFactory {
public:
LegoObjectFactory();

2
LEGO1/lego/legoomni/include/legopartpresenter.h
View File

@@ -5,7 +5,7 @@
#include "mxmediapresenter.h"
// VTABLE: LEGO1 0x100d4df0
// SIZE 0x54 (from inlined construction at 0x10009fac)
// SIZE 0x54
class LegoPartPresenter : public MxMediaPresenter {
public:
LegoPartPresenter() { Reset(); }

2
LEGO1/lego/legoomni/include/legopathactor.h
View File

@@ -6,7 +6,7 @@
#include "realtime/matrix.h"
// VTABLE: LEGO1 0x100d6e28
// SIZE 0x154 (from inlined construction at 0x1000a346)
// SIZE 0x154
class LegoPathActor : public LegoActor {
public:
LegoPathActor();

13
LEGO1/lego/legoomni/include/legopathcontroller.h
View File

@@ -38,6 +38,19 @@ public:
undefined4 FUN_10046770(IslePathActor* p_actor);
MxResult FUN_10046b30(LegoPathBoundary** p_path, MxS32& p_value);
void Enable(MxBool p_enable);
private:
undefined4 m_unk0x08; // 0x08
undefined4 m_unk0x0c; // 0x0c
undefined4 m_unk0x10; // 0x10
undefined4 m_unk0x14; // 0x14
undefined2 m_unk0x18; // 0x18
undefined2 m_unk0x1a; // 0x1a
undefined2 m_unk0x1c; // 0x1c
undefined2 m_unk0x1e; // 0x1e
// These 2 are some sort of template class
undefined m_unk0x20[0x10]; // 0x20
undefined m_unk0x30[0x10]; // 0x30
};
#endif // LEGOPATHCONTROLLER_H

17
LEGO1/lego/legoomni/include/legoraceactor.h
View File

@@ -4,9 +4,16 @@
#include "legoanimactor.h"
#include "realtime/matrix.h"
// VTABLE: LEGO1 0x100d5b88
class LegoRaceActor : public LegoAnimActor {
/*
VTABLE: LEGO1 0x100d5b78 LegoAnimActor
VTABLE: LEGO1 0x100d5b88 LegoPathActor
VTABLE: LEGO1 0x100d5c54 LegoRaceActor
*/
// SIZE 0x180
class LegoRaceActor : public virtual LegoAnimActor {
public:
LegoRaceActor();
// FUNCTION: LEGO1 0x10014af0
inline const char* ClassName() const override // vtable+0x0c
{
@@ -28,8 +35,14 @@ public:
MxS32 VTable0x90() override; // vtable+0x90
MxS32 VTable0x94() override; // vtable+0x94
// FUNCTION: LEGO1 0x10014aa0
virtual MxResult FUN_10014aa0() { return SUCCESS; }
// SYNTHETIC: LEGO1 0x10014ab0
// LegoRaceActor::`scalar deleting destructor'
private:
undefined4 m_unk0x08; // 0x08
};
#endif // LEGORACEACTOR_H

31
LEGO1/lego/legoomni/include/legoracecar.h
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

36
LEGO1/lego/legoomni/include/legoracemap.h Normal file
View File

@@ -0,0 +1,36 @@
#ifndef LEGORACEMAP_H
#define LEGORACEMAP_H
#include "legoraceactor.h"
/*
VTABLE: LEGO1 0x100d8858 LegoRaceActor
VTABLE: LEGO1 0x100d8860 LegoAnimActor
VTABLE: LEGO1 0x100d8870 LegoPathActor
VTABLE: LEGO1 0x100d893c LegoRaceMap
*/
// SIZE 0x1b4
class LegoRaceMap : public virtual LegoRaceActor {
public:
LegoRaceMap();
virtual void FUN_1005d4b0();
// SYNTHETIC: LEGO1 0x1005d5c0
// LegoRaceMap::`scalar deleting destructor'
private:
MxBool m_unk0x08; // 0x08
void* m_unk0x0c; // 0x0c
undefined4 m_unk0x10; // 0x10
float m_unk0x14; // 0x14
float m_unk0x18; // 0x18
float m_unk0x1c; // 0x1c
float m_unk0x20; // 0x20
float m_unk0x24; // 0x24
float m_unk0x28; // 0x28
float m_unk0x2c; // 0x2c
undefined4 m_unk0x30; // 0x30
};
#endif // LEGORACEMAP_H

2
LEGO1/lego/legoomni/include/legotexturepresenter.h
View File

@@ -5,7 +5,7 @@
#include "mxmediapresenter.h"
// VTABLE: LEGO1 0x100d4d90
// SIZE 0x54 (from inlined construction at 0x10009bb5)
// SIZE 0x54
class LegoTexturePresenter : public MxMediaPresenter {
public:
LegoTexturePresenter() : m_textures(NULL) {}

1
LEGO1/lego/legoomni/include/legounknown100d7c88.h
View File

@@ -5,6 +5,7 @@
#include "mxstring.h"
// VTABLE: LEGO1 0x100d7c88
// SIZE 0x18
class LegoUnknown100d7c88 {
public:
~LegoUnknown100d7c88();

7
LEGO1/lego/legoomni/include/pizzeria.h
View File

@@ -7,6 +7,8 @@
// SIZE 0x84
class Pizzeria : public IsleActor {
public:
Pizzeria() : m_unk0x7c(0) {}
// FUNCTION: LEGO1 0x1000e780
inline const char* ClassName() const override // vtable+0x0c
{
@@ -24,6 +26,11 @@ public:
// SYNTHETIC: LEGO1 0x1000e8d0
// Pizzeria::`scalar deleting destructor'
private:
undefined4 m_unk0x78; // 0x78
undefined4 m_unk0x7c; // 0x7c
undefined4 m_unk0x80; // 0x80
};
#endif // PIZZERIA_H

15
LEGO1/lego/legoomni/include/pizzeriastate.h
View File

@@ -3,8 +3,17 @@
#include "legostate.h"
// SIZE 0x14
struct PizzeriaStateStruct {
undefined4 m_unk0x00; // 0x00
undefined4 m_unk0x04; // 0x04
undefined4 m_unk0x08; // 0x08
undefined4 m_unk0x0c; // 0x0c
undefined4 m_unk0x10; // 0x10
};
// VTABLE: LEGO1 0x100d5ee8
// SIZE 0xb4
// SIZE 0x58
class PizzeriaState : public LegoState {
public:
PizzeriaState();
@@ -26,6 +35,10 @@ public:
// SYNTHETIC: LEGO1 0x10017ce0
// PizzeriaState::`scalar deleting destructor'
private:
Playlist m_unk0x08[5]; // 0x08
PizzeriaStateStruct m_unk0x44; // 0x44
};
#endif // PIZZERIASTATE_H

1
LEGO1/lego/legoomni/include/police.h
View File

@@ -12,7 +12,6 @@ class PoliceState;
// VTABLE: LEGO1 0x100d8a80
// SIZE 0x110
// Radio at 0xf8
class Police : public LegoWorld {
public:
Police();

19
LEGO1/lego/legoomni/include/raceskel.h Normal file
View File

@@ -0,0 +1,19 @@
#ifndef RACESKEL_H
#define RACESKEL_H
#include "legoanimactor.h"
/*
VTABLE: LEGO1 0x100d7668 LegoPathActor
VTABLE: LEGO1 0x100d7738 LegoAnimActor
*/
// SIZE 0x178
class RaceSkel : public LegoAnimActor {
public:
RaceSkel();
private:
undefined4 m_unk0x1c; // 0x1c
};
#endif // RACESKEL_H