From 3897e9c01568a05f1859d60f54bdc38abcc8b397 Mon Sep 17 00:00:00 2001 From: Misha <106913236+MishaProductions@users.noreply.github.com> Date: Tue, 5 Mar 2024 16:05:38 -0500 Subject: [PATCH] Add JailEntity class (#630) * Add JailEntity class * Update legoobjectfactory.h * Update jailentity.h --------- Co-authored-by: Christian Semmler --- LEGO1/lego/legoomni/include/jailentity.h | 29 +++++++++++++++++++ .../lego/legoomni/include/legoobjectfactory.h | 2 +- .../legoomni/src/common/legoobjectfactory.cpp | 8 ++--- 3 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 LEGO1/lego/legoomni/include/jailentity.h diff --git a/LEGO1/lego/legoomni/include/jailentity.h b/LEGO1/lego/legoomni/include/jailentity.h new file mode 100644 index 00000000..adf7089a --- /dev/null +++ b/LEGO1/lego/legoomni/include/jailentity.h @@ -0,0 +1,29 @@ +#ifndef JAILENTITY_H +#define JAILENTITY_H + +#include "buildingentity.h" + +// VTABLE: LEGO1 0x100d5200 +// SIZE 0x68 +class JailEntity : public BuildingEntity { + // FUNCTION: LEGO1 0x1000f0c0 + inline const char* ClassName() const override // vtable+0x0c + { + // STRING: LEGO1 0x100f0300 + return "RaceStandsEntity"; + } + + // FUNCTION: LEGO1 0x1000f0d0 + inline MxBool IsA(const char* p_name) const override // vtable+0x10 + { + return !strcmp(p_name, JailEntity::ClassName()) || BuildingEntity::IsA(p_name); + } + + // STUB: LEGO1 0x100154f0 + MxLong VTable0x50(MxParam& p_param) override { return 0; } + + // SYNTHETIC: LEGO1 0x1000fac0 + // JailEntity::`scalar deleting destructor' +}; + +#endif // JAILENTITY_H diff --git a/LEGO1/lego/legoomni/include/legoobjectfactory.h b/LEGO1/lego/legoomni/include/legoobjectfactory.h index a99efec2..f05ab0d2 100644 --- a/LEGO1/lego/legoomni/include/legoobjectfactory.h +++ b/LEGO1/lego/legoomni/include/legoobjectfactory.h @@ -94,7 +94,7 @@ X(JukeBoxEntity) \ X(RadioState) \ X(CaveEntity) \ - /*X(JailEntity)*/ \ + X(JailEntity) \ X(MxCompositeMediaPresenter) \ X(JukeBox) \ X(JukeBoxState) \ diff --git a/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp b/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp index 87454802..9d87ccf1 100644 --- a/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp +++ b/LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp @@ -84,17 +84,17 @@ #include "gasstationentity.h" #include "hospitalentity.h" #include "infocenterentity.h" +#include "jailentity.h" #include "jetskiracestate.h" +#include "jukebox.h" #include "jukeboxentity.h" +#include "jukeboxstate.h" +#include "mxcompositemediapresenter.h" #include "pizzeria.h" #include "pizzeriastate.h" #include "policeentity.h" #include "racestandsentity.h" #include "radiostate.h" -// #include "jailentity.h" -#include "jukebox.h" -#include "jukeboxstate.h" -#include "mxcompositemediapresenter.h" // #include "raceskel.h" #include "animstate.h"