From 020ae126cb484adbce49af568a1fd4c84bb58d8d Mon Sep 17 00:00:00 2001 From: Joshua Peisach Date: Wed, 10 Apr 2024 09:26:32 -0400 Subject: [PATCH] fix pizzeria vtable --- LEGO1/lego/legoomni/include/pizzeria.h | 37 +++++++++++---------- LEGO1/lego/legoomni/src/actors/pizzeria.cpp | 7 ++++ 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/LEGO1/lego/legoomni/include/pizzeria.h b/LEGO1/lego/legoomni/include/pizzeria.h index f214b5d5..92ce53d1 100644 --- a/LEGO1/lego/legoomni/include/pizzeria.h +++ b/LEGO1/lego/legoomni/include/pizzeria.h @@ -1,35 +1,38 @@ #ifndef PIZZERIA_H #define PIZZERIA_H +#include "decomp.h" #include "isleactor.h" // VTABLE: LEGO1 0x100d5520 // SIZE 0x84 class Pizzeria : public IsleActor { public: - Pizzeria() : m_unk0x7c(0) {} + Pizzeria() : m_unk0x7c(0) {} - // FUNCTION: LEGO1 0x1000e780 - inline const char* ClassName() const override // vtable+0x0c - { - // STRING: LEGO1 0x100f0380 - return "Pizzeria"; - } + // FUNCTION: LEGO1 0x1000e780 + inline const char *ClassName() const override // vtable+0x0c + { + // STRING: LEGO1 0x100f0380 + return "Pizzeria"; + } - // FUNCTION: LEGO1 0x1000e790 - inline MxBool IsA(const char* p_name) const override // vtable+0x10 - { - return !strcmp(p_name, Pizzeria::ClassName()) || IsleActor::IsA(p_name); - } + // FUNCTION: LEGO1 0x1000e790 + inline MxBool IsA(const char *p_name) const override // vtable+0x10 + { + return !strcmp(p_name, Pizzeria::ClassName()) || IsleActor::IsA(p_name); + } - MxResult Create(MxDSAction& p_dsAction) override; // vtable+0x18 + MxResult Create(MxDSAction &p_dsAction) override; // vtable+0x18 - // SYNTHETIC: LEGO1 0x1000e8d0 - // Pizzeria::`scalar deleting destructor' + virtual undefined4 VTable0x68() override; // vtable+0x68 + + // SYNTHETIC: LEGO1 0x1000e8d0 + // Pizzeria::`scalar deleting destructor' private: - undefined4 m_unk0x7c; // 0x7c - undefined4 m_unk0x80; // 0x80 + undefined4 m_unk0x7c; // 0x7c + undefined4 m_unk0x80; // 0x80 }; #endif // PIZZERIA_H diff --git a/LEGO1/lego/legoomni/src/actors/pizzeria.cpp b/LEGO1/lego/legoomni/src/actors/pizzeria.cpp index b8c47e36..ce35f634 100644 --- a/LEGO1/lego/legoomni/src/actors/pizzeria.cpp +++ b/LEGO1/lego/legoomni/src/actors/pizzeria.cpp @@ -8,3 +8,10 @@ MxResult Pizzeria::Create(MxDSAction& p_dsAction) // TODO return SUCCESS; } + +// STUB: LEGO1 0x10017a50 +undefined4 Pizzeria::VTable0x68() +{ + // TODO + return 0; +}