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

Fix remaining vtordisp issues (#1016)

Browse Source 
* Fix LegoRaceActor

* Fix LegoRaceMap

* Fix LegoCarRaceActor

* Fix LegoJetskiRaceActor

* Fix LegoJetski

* Fix LegoRaceCar

* Downgrade orig addr unique message to debug
This commit is contained in:
MS
2024-06-10 13:04:40 -04:00
committed by GitHub
parent c22c6f3379
commit 9383076e04
13 changed files with 181 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,25 +3,23 @@
#include "legoraceactor.h"
/*
VTABLE: LEGO1 0x100da0c0 LegoRaceActor
VTABLE: LEGO1 0x100da0c8 LegoAnimActor
VTABLE: LEGO1 0x100da0d8 LegoPathActor
VTABLE: LEGO1 0x100da1a8 LegoCarRaceActor
*/
// 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
// FUNCTION: LEGO1 0x10081660
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f0568
return "LegoCarRaceActor";
}
// FUNCTION: LEGO1 0x10081670
// FUNCTION: LEGO1 0x10081680
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, LegoCarRaceActor::ClassName()) || LegoRaceActor::IsA(p_name);
@@ -34,10 +32,8 @@ public:
float p_f1,
float p_f2,
Vector3& p_v3
) override; // vtable+0x6c
void VTable0x70(float p_float) override; // vtable+0x70
MxU32 VTable0x90(float, Matrix4&) override; // vtable+0x90
MxResult VTable0x94(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94
) override; // vtable+0x6c
void VTable0x70(float p_float) override; // vtable+0x70
void SwitchBoundary(LegoPathBoundary*& p_boundary, LegoUnknown100db7f4*& p_edge, float& p_unk0xe4)
override; // vtable+0x98
MxResult VTable0x9c() override; // vtable+0x9c
@@ -64,7 +60,7 @@ public:
virtual void VTable0x1c(); // vtable+0x1c
// SYNTHETIC: LEGO1 0x10081610
// SYNTHETIC: LEGO1 0x10081620
// LegoCarRaceActor::`scalar deleting destructor'
protected:

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

@@ -4,28 +4,27 @@
#include "legojetskiraceactor.h"
#include "legoracemap.h"
/*
VTABLE: LEGO1 0x100d5a08 LegoJetskiRaceActor
VTABLE: LEGO1 0x100d5a28 LegoRaceActor
VTABLE: LEGO1 0x100d5a30 LegoAnimActor
VTABLE: LEGO1 0x100d5a40 LegoPathActor
VTABLE: LEGO1 0x100d5b10 LegoRaceMap
*/
// 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();
~LegoJetski() override;
MxLong Notify(MxParam& p_param) override; // vtable+0x04
// FUNCTION: LEGO1 0x10013e80
// FUNCTION: LEGO1 0x10013e90
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f053c
return "LegoJetski";
}
// FUNCTION: LEGO1 0x10013ea0
// FUNCTION: LEGO1 0x10013eb0
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, LegoJetski::ClassName()) || LegoJetskiRaceActor::IsA(p_name);
@@ -49,7 +48,7 @@ public:
virtual void FUN_100136f0(float p_worldSpeed);
// SYNTHETIC: LEGO1 0x10013e20
// SYNTHETIC: LEGO1 0x10013e30
// LegoJetski::`scalar deleting destructor'
};

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

@@ -3,25 +3,23 @@
#include "legocarraceactor.h"
/*
VTABLE: LEGO1 0x100da208 LegoCarRaceActor
VTABLE: LEGO1 0x100da228 LegoRaceActor
VTABLE: LEGO1 0x100da230 LegoAnimActor
VTABLE: LEGO1 0x100da240 LegoPathActor
*/
// 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
// FUNCTION: LEGO1 0x10081d90
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f0554
return "LegoJetskiRaceActor";
}
// FUNCTION: LEGO1 0x10081da0
// FUNCTION: LEGO1 0x10081db0
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, LegoJetskiRaceActor::ClassName()) || LegoCarRaceActor::IsA(p_name);
@@ -36,12 +34,9 @@ public:
Vector3& p_v3
) override; // vtable+0x6c
void VTable0x70(float p_float) override; // vtable+0x70
void SwitchBoundary(LegoPathBoundary*& p_boundary, LegoUnknown100db7f4*& p_edge, float& p_unk0xe4)
override; // vtable+0x98
MxResult VTable0x9c() override; // vtable+0x9c
void VTable0x1c() override; // vtable+0x1c
void VTable0x1c() override; // vtable+0x1c
// SYNTHETIC: LEGO1 0x10081d40
// SYNTHETIC: LEGO1 0x10081d50
// LegoJetskiRaceActor::`scalar deleting destructor'
};

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

@@ -5,40 +5,35 @@
class Matrix4;
/*
VTABLE: LEGO1 0x100d5b78 LegoAnimActor
VTABLE: LEGO1 0x100d5b88 LegoPathActor
VTABLE: LEGO1 0x100d5c54 LegoRaceActor
*/
// VTABLE: LEGO1 0x100d5b78 LegoAnimActor
// VTABLE: LEGO1 0x100d5b88 LegoPathActor
// VTABLE: LEGO1 0x100d5c54 LegoRaceActor
// SIZE 0x180
class LegoRaceActor : public virtual LegoAnimActor {
public:
LegoRaceActor();
// FUNCTION: LEGO1 0x10014af0
// FUNCTION: LEGO1 0x10014b00
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f0bf4
return "LegoRaceActor";
}
// FUNCTION: LEGO1 0x10014b10
// FUNCTION: LEGO1 0x10014b20
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, LegoRaceActor::ClassName()) || LegoAnimActor::IsA(p_name);
}
void SetWorldSpeed(MxFloat p_worldSpeed) override; // vtable+0x30
MxS32 VTable0x68(Vector3&, Vector3&, Vector3&) override; // vtable+0x68
void VTable0x70(float p_float) override; // vtable+0x70
void VTable0x74(Matrix4& p_transform) override; // vtable+0x74
MxU32 VTable0x90(float, Matrix4&) override; // vtable+0x90
MxResult VTable0x94(LegoPathActor* p_actor, MxBool p_bool) override; // vtable+0x94
// FUNCTION: LEGO1 0x10014aa0
virtual MxResult FUN_10014aa0() { return SUCCESS; }
// SYNTHETIC: LEGO1 0x10014ab0
// SYNTHETIC: LEGO1 0x10014ac0
// LegoRaceActor::`scalar deleting destructor'
private:

22
LEGO1/lego/legoomni/include/legoracecar.h
View File

@@ -4,30 +4,30 @@
#include "legocarraceactor.h"
#include "legoracemap.h"
/*
VTABLE: LEGO1 0x100d58a0 LegoRaceActor
VTABLE: LEGO1 0x100d58a8 LegoAnimActor
VTABLE: LEGO1 0x100d58b8 LegoPathActor
VTABLE: LEGO1 0x100d5894 LegoRaceMap
VTABLE: LEGO1 0x100d5898 LegoCarRaceActor
*/
// VTABLE: LEGO1 0x100d58a0 LegoRaceActor
// VTABLE: LEGO1 0x100d58a8 LegoAnimActor
// VTABLE: LEGO1 0x100d58b8 LegoPathActor
// VTABLE: LEGO1 0x100d5984 LegoRaceMap
// VTABLE: LEGO1 0x100d5988 LegoCarRaceActor
// SIZE 0x200
class LegoRaceCar : public LegoCarRaceActor, public LegoRaceMap {
public:
LegoRaceCar();
~LegoRaceCar() override;
MxLong Notify(MxParam& p_param) override; // vtable+0x04
// FUNCTION: LEGO1 0x10014290
// FUNCTION: LEGO1 0x100142a0
inline const char* ClassName() const override // vtable+0x0c
{
// STRING: LEGO1 0x100f0548
return "LegoRaceCar";
}
// FUNCTION: LEGO1 0x100142b0
// FUNCTION: LEGO1 0x100142c0
inline MxBool IsA(const char* p_name) const override // vtable+0x10
{
return !strcmp(p_name, LegoCarRaceActor::ClassName()) || LegoCarRaceActor::IsA(p_name);
return !strcmp(p_name, LegoRaceCar::ClassName()) || LegoCarRaceActor::IsA(p_name);
}
void ParseAction(char*) override; // vtable+0x20
@@ -50,7 +50,7 @@ public:
virtual void FUN_10012ff0(float);
virtual MxBool FUN_10013130(float);
// SYNTHETIC: LEGO1 0x10014230
// SYNTHETIC: LEGO1 0x10014240
// LegoRaceCar::`scalar deleting destructor'
private:

21
LEGO1/lego/legoomni/include/legoracemap.h
View File

@@ -3,20 +3,25 @@
#include "legoraceactor.h"
/*
VTABLE: LEGO1 0x100d8858 LegoRaceActor
VTABLE: LEGO1 0x100d8860 LegoAnimActor
VTABLE: LEGO1 0x100d8870 LegoPathActor
VTABLE: LEGO1 0x100d893c LegoRaceMap
*/
// 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();
~LegoRaceMap() override;
virtual void FUN_1005d4b0();
// LegoPathActor vtable
MxLong Notify(MxParam& p_param) override; // vtable+0x04
void ParseAction(char* p_extra) override; // vtable+0x20
void VTable0x70(float p_und) override = 0; // vtable+0x70
// SYNTHETIC: LEGO1 0x1005d5c0
// LegoRaceMap vtable
virtual void FUN_1005d4b0(); // vtable+0x00
// SYNTHETIC: LEGO1 0x1005d5d0
// LegoRaceMap::`scalar deleting destructor'
private: