From 0431c02a976a5ffbf80910e852720308192d6220 Mon Sep 17 00:00:00 2001 From: Cydra Date: Fri, 23 Jun 2023 17:13:24 +0200 Subject: [PATCH] Some additional fixes --- ISLE/isle.cpp | 22 +--------------------- LEGO1/isle.cpp | 22 +++++++++++++++++++++- LEGO1/legoworld.h | 2 +- LEGO1/mxpresenter.cpp | 4 +++- LEGO1/mxpresenter.h | 2 +- 5 files changed, 27 insertions(+), 25 deletions(-) diff --git a/ISLE/isle.cpp b/ISLE/isle.cpp index 49bd3f9a..f16ced34 100644 --- a/ISLE/isle.cpp +++ b/ISLE/isle.cpp @@ -637,24 +637,4 @@ void Isle::Tick(BOOL sleepIfNotNextFrame) } Sleep(0); -} - -// OFFSET: LEGO1 0x10030fc0 -void Isle::VTable0x50() -{ - // TODO -} - -// OFFSET: LEGO1 0x10033180 -undefined4 Isle::VTable0x64() -{ - // TODO - - return undefined4(); -} - -// OFFSET: LEGO1 0x1003305 -void Isle::VTable0x6c(int *param) -{ - // TODO -} +} \ No newline at end of file diff --git a/LEGO1/isle.cpp b/LEGO1/isle.cpp index 52215d2e..dfcae287 100644 --- a/LEGO1/isle.cpp +++ b/LEGO1/isle.cpp @@ -4,4 +4,24 @@ Isle::Isle() { // TODO -} \ No newline at end of file +} + +// OFFSET: LEGO1 0x10030fc0 +void Isle::VTable0x50() +{ + // TODO +} + +// OFFSET: LEGO1 0x10033180 +undefined4 Isle::VTable0x64() +{ + // TODO + + return undefined4(); +} + +// OFFSET: LEGO1 0x1003305 +void Isle::VTable0x6c(int *param) +{ + // TODO +} diff --git a/LEGO1/legoworld.h b/LEGO1/legoworld.h index ad665eb1..f99fadae 100644 --- a/LEGO1/legoworld.h +++ b/LEGO1/legoworld.h @@ -7,7 +7,7 @@ class LegoWorld : public LegoEntity { public: __declspec(dllexport) LegoWorld(); - __declspec(dllexport) virtual ~LegoWorld(); + __declspec(dllexport) virtual ~LegoWorld(); // vtable+0x0 }; #endif // LEGOWORLD_H diff --git a/LEGO1/mxpresenter.cpp b/LEGO1/mxpresenter.cpp index c6f54154..62226a20 100644 --- a/LEGO1/mxpresenter.cpp +++ b/LEGO1/mxpresenter.cpp @@ -88,9 +88,11 @@ void MxPresenter::VTable0x20() } // OFFSET: LEGO1 0x1000bea0 -void MxPresenter::VTable0x24() +unsigned int MxPresenter::VTable0x24() { // TODO + + return 0; } // OFFSET: LEGO1 0x1000bec0 diff --git a/LEGO1/mxpresenter.h b/LEGO1/mxpresenter.h index 18d0f1ab..03c526a2 100644 --- a/LEGO1/mxpresenter.h +++ b/LEGO1/mxpresenter.h @@ -17,7 +17,7 @@ class MxPresenter : public MxCore virtual void VTable0x18(); // vtable+0x18 virtual void VTable0x1c(); // vtable+0x1c virtual void VTable0x20(); // vtable+0x20 - virtual void VTable0x24(); // vtable+0x24 + virtual unsigned int VTable0x24(); // vtable+0x24 virtual void VTable0x28(); // vtable+0x28 protected: __declspec(dllexport) virtual void DoneTickle(); // vtable+0x2c