CarRace ctor (#372)

* CarRace ctor

* Fixes

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Joshua Peisach
2023-12-27 13:27:02 -05:00
committed by GitHub
parent 5a1ba02772
commit f1f6743d08
3 changed files with 31 additions and 18 deletions

View File

@@ -1,7 +1,10 @@
#include "carrace.h" #include "carrace.h"
// STUB: LEGO1 0x10016a90 DECOMP_SIZE_ASSERT(CarRace, 0x154);
// FUNCTION: LEGO1 0x10016a90
CarRace::CarRace() CarRace::CarRace()
{ {
// TODO this->m_unk0x150 = 0;
this->m_unk0x130 = MxRect32(0x16c, 0x154, 0x1ec, 0x15e);
} }

View File

@@ -1,6 +1,7 @@
#ifndef CARRACE_H #ifndef CARRACE_H
#define CARRACE_H #define CARRACE_H
#include "decomp.h"
#include "legorace.h" #include "legorace.h"
// VTABLE: LEGO1 0x100d5e50 // VTABLE: LEGO1 0x100d5e50
@@ -21,6 +22,10 @@ public:
{ {
return !strcmp(p_name, CarRace::ClassName()) || LegoRace::IsA(p_name); return !strcmp(p_name, CarRace::ClassName()) || LegoRace::IsA(p_name);
} }
private:
undefined m_unk0x144[12]; // 0x144
undefined4 m_unk0x150; // 0x150
}; };
#endif // CARRACE_H #endif // CARRACE_H

View File

@@ -3,6 +3,7 @@
#include "decomp.h" #include "decomp.h"
#include "legoworld.h" #include "legoworld.h"
#include "mxrect32.h"
#include "mxtypes.h" #include "mxtypes.h"
// VTABLE: LEGO1 0x100d5db0 // VTABLE: LEGO1 0x100d5db0
@@ -38,22 +39,26 @@ public:
virtual void VTable0x7c(undefined4, undefined4); // vtable+0x7c virtual void VTable0x7c(undefined4, undefined4); // vtable+0x7c
private: private:
undefined4 m_unk0xf8; // 0xf8 undefined4 m_unk0xf8; // 0xf8
undefined4 m_unk0xfc; // 0xfc undefined4 m_unk0xfc; // 0xfc
undefined4 m_unk0x100; // 0x100 undefined4 m_unk0x100; // 0x100
undefined4 m_unk0x104; // 0x104 undefined4 m_unk0x104; // 0x104
undefined4 m_unk0x108; // 0x108 undefined4 m_unk0x108; // 0x108
undefined4 m_unk0x10c; // 0x10c undefined4 m_unk0x10c; // 0x10c
undefined4 m_unk0x110; // 0x110 undefined4 m_unk0x110; // 0x110
undefined4 m_unk0x114; // 0x114 undefined4 m_unk0x114; // 0x114
undefined4 m_unk0x118; // 0x118 undefined4 m_unk0x118; // 0x118
undefined4 m_unk0x11c; // 0x11c undefined4 m_unk0x11c; // 0x11c
undefined4 m_unk0x120; // 0x120 - this may be the current vehcle (function at 0x10015880) undefined4 m_unk0x120; // 0x120
undefined4 m_unk0x124; // 0x124 - something game state undefined4 m_unk0x124; // 0x124
undefined4 m_unk0x128; // 0x128 undefined4 m_unk0x128; // 0x128
undefined4 m_unk0x12c; // 0x12c undefined4 m_unk0x12c; // 0x12c
undefined4 m_unk0x130[4]; // unconfirmed bytes, ghidra claims these are integers
undefined4 m_unk0x140; protected:
MxRect32 m_unk0x130; // 0x130
private:
undefined4 m_unk0x140; // 0x140
}; };
#endif // LEGORACE_H #endif // LEGORACE_H