diff --git a/LEGO1/legoomni.cpp b/LEGO1/legoomni.cpp index 494c5291..715a48f9 100644 --- a/LEGO1/legoomni.cpp +++ b/LEGO1/legoomni.cpp @@ -530,7 +530,7 @@ MxBool LegoOmni::DoesEntityExist(MxDSAction& ds) } // OFFSET: LEGO1 0x1005b2f0 -LegoWorld* LegoOmni::Vtable0x30(const char* p_id, int p_entityId, MxCore* p_presenter) +MxEntity* LegoOmni::FindWorld(char* p_id, int p_entityId, MxCore* p_presenter) { LegoWorld* foundEntity = NULL; if (strcmpi(p_id, g_current)) { diff --git a/LEGO1/legoomni.h b/LEGO1/legoomni.h index 40439df7..d528db8e 100644 --- a/LEGO1/legoomni.h +++ b/LEGO1/legoomni.h @@ -89,7 +89,7 @@ class LegoOmni : public MxOmni { virtual MxResult Start(MxDSAction* action) override; // vtable+20 virtual MxResult DeleteObject(MxDSAction& ds) override; // vtable+24 virtual MxBool DoesEntityExist(MxDSAction& ds) override; // vtable+28 - virtual LegoWorld* Vtable0x30(const char* p_id, int p_entityId, MxCore* p_presenter) override; // vtable+30 + MxEntity* FindWorld(char* p_id, int p_entityId, MxCore* p_presenter) override; // vtable+30 virtual void NotifyCurrentEntity(MxNotificationParam* p_param) override; // vtable+34 virtual void StartTimer() override; // vtable+38 virtual void StopTimer() override; // vtable+3c diff --git a/LEGO1/mxomni.cpp b/LEGO1/mxomni.cpp index edd71d99..cb7da2fa 100644 --- a/LEGO1/mxomni.cpp +++ b/LEGO1/mxomni.cpp @@ -91,11 +91,10 @@ void MxOmni::Vtable0x2c() // TODO } -// OFFSET: LEGO1 0x100aefb0 STUB -int MxOmni::Vtable0x30(char*, int, MxCore*) +// OFFSET: LEGO1 0x100aefb0 +MxEntity* MxOmni::FindWorld(char*, int, MxCore*) { - // TODO - return 0; + return NULL; } // OFFSET: LEGO1 0x100aefc0 diff --git a/LEGO1/mxomni.h b/LEGO1/mxomni.h index 40fad828..3794c765 100644 --- a/LEGO1/mxomni.h +++ b/LEGO1/mxomni.h @@ -20,6 +20,7 @@ class MxTickleManager; class MxTimer; class MxVariableTable; class MxVideoManager; +class MxEntity; // VTABLE 0x100dc168 // SIZE 0x68 @@ -45,7 +46,7 @@ class MxOmni : public MxCore { virtual MxResult DeleteObject(MxDSAction& p_dsAction); // vtable+24 virtual MxBool DoesEntityExist(MxDSAction& p_dsAction); // vtable+28 virtual void Vtable0x2c(); // vtable+2c - virtual int Vtable0x30(char*, int, MxCore*); // vtable+30 + virtual MxEntity* FindWorld(char*, int, MxCore*); // vtable+30 virtual void NotifyCurrentEntity(MxNotificationParam* p_param); // vtable+34 virtual void StartTimer(); // vtable+38 virtual void StopTimer(); // vtable+3c