From 6a99ec6b903aa718fa46f2063634d9f36563e323 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Mon, 6 Nov 2023 03:54:06 -0500 Subject: [PATCH] Fixes --- LEGO1/legogamestate.h | 2 +- LEGO1/legoomni.cpp | 5 +++-- LEGO1/legoomni.h | 22 +++++++++++----------- LEGO1/mxdsobject.h | 2 +- LEGO1/mxomni.cpp | 2 +- LEGO1/mxomni.h | 2 +- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/LEGO1/legogamestate.h b/LEGO1/legogamestate.h index 97fa92c7..82ff4d9c 100644 --- a/LEGO1/legogamestate.h +++ b/LEGO1/legogamestate.h @@ -37,7 +37,7 @@ class LegoGameState { inline MxU32 GetUnknown10() { return m_unk10; } inline void SetUnknown424(undefined4 p_unk424) { m_unk424 = p_unk424; } - void SetSomeEnumState(undefined4 state); + void SetSomeEnumState(undefined4 p_state); private: void RegisterState(LegoState* p_state); diff --git a/LEGO1/legoomni.cpp b/LEGO1/legoomni.cpp index 38b78125..203cfb16 100644 --- a/LEGO1/legoomni.cpp +++ b/LEGO1/legoomni.cpp @@ -134,7 +134,7 @@ void LegoOmni::RemoveWorld(const MxAtomId& p1, MxLong p2) } // OFFSET: LEGO1 0x1005b0c0 STUB -LegoEntity* LegoOmni::FindByEntityIdOrAtomId(MxAtomId& p_atom, int p_entityid) +LegoEntity* LegoOmni::FindByEntityIdOrAtomId(const MxAtomId& p_atom, MxS32 p_entityid) { // TODO return NULL; @@ -420,6 +420,7 @@ void LegoOmni::Init() // OFFSET: LEGO1 0x1001a700 STUB void FUN_1001a700() { + // TODO } // OFFSET: LEGO1 0x10058e70 @@ -530,7 +531,7 @@ MxBool LegoOmni::DoesEntityExist(MxDSAction& ds) } // OFFSET: LEGO1 0x1005b2f0 -MxEntity* LegoOmni::FindWorld(char* p_id, int p_entityId, MxCore* p_presenter) +MxEntity* LegoOmni::FindWorld(const char* p_id, MxS32 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 c63623c1..52ea2d85 100644 --- a/LEGO1/legoomni.h +++ b/LEGO1/legoomni.h @@ -83,18 +83,18 @@ class LegoOmni : public MxOmni { return !strcmp(name, LegoOmni::ClassName()) || MxOmni::IsA(name); } - virtual void Init() override; // vtable+14 - virtual MxResult Create(MxOmniCreateParam& p) override; // vtable+18 - virtual void Destroy() override; // vtable+1c - virtual MxResult Start(MxDSAction* action) override; // vtable+20 - virtual MxResult DeleteObject(MxDSAction& ds) override; // vtable+24 - virtual MxBool DoesEntityExist(MxDSAction& ds) override; // vtable+28 - 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 + virtual void Init() override; // vtable+14 + virtual MxResult Create(MxOmniCreateParam& p) override; // vtable+18 + virtual void Destroy() override; // vtable+1c + 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 MxEntity* FindWorld(const char* p_id, MxS32 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 - LegoEntity* FindByEntityIdOrAtomId(MxAtomId& p_atom, int p_entityid); + LegoEntity* FindByEntityIdOrAtomId(const MxAtomId& p_atom, MxS32 p_entityid); LegoVideoManager* GetVideoManager() { return (LegoVideoManager*) m_videoManager; } LegoSoundManager* GetSoundManager() { return (LegoSoundManager*) m_soundManager; } diff --git a/LEGO1/mxdsobject.h b/LEGO1/mxdsobject.h index 9333c452..9064fc81 100644 --- a/LEGO1/mxdsobject.h +++ b/LEGO1/mxdsobject.h @@ -35,7 +35,7 @@ class MxDSObject : public MxCore { // OFFSET: LEGO1 0x10005530 inline virtual void SetAtomId(MxAtomId p_atomId) { this->m_atomId = p_atomId; } // vtable+20; - inline MxAtomId& GetAtomId() { return this->m_atomId; } + inline const MxAtomId& GetAtomId() { return this->m_atomId; } inline MxU32 GetObjectId() { return this->m_objectId; } inline MxS16 GetUnknown24() { return this->m_unk24; } diff --git a/LEGO1/mxomni.cpp b/LEGO1/mxomni.cpp index cb7da2fa..b4b430a3 100644 --- a/LEGO1/mxomni.cpp +++ b/LEGO1/mxomni.cpp @@ -92,7 +92,7 @@ void MxOmni::Vtable0x2c() } // OFFSET: LEGO1 0x100aefb0 -MxEntity* MxOmni::FindWorld(char*, int, MxCore*) +MxEntity* MxOmni::FindWorld(const char*, MxS32, MxCore*) { return NULL; } diff --git a/LEGO1/mxomni.h b/LEGO1/mxomni.h index 3794c765..562de18a 100644 --- a/LEGO1/mxomni.h +++ b/LEGO1/mxomni.h @@ -46,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 MxEntity* FindWorld(char*, int, MxCore*); // vtable+30 + virtual MxEntity* FindWorld(const char*, MxS32, MxCore*); // vtable+30 virtual void NotifyCurrentEntity(MxNotificationParam* p_param); // vtable+34 virtual void StartTimer(); // vtable+38 virtual void StopTimer(); // vtable+3c