isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-24 00:31:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Christian Semmler 2023-11-06 03:54:06 -05:00
parent 0f3372f9dc
commit 6a99ec6b90
6 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/legogamestate.h
View File

@ -37,7 +37,7 @@ class LegoGameState {
inline MxU32 GetUnknown10() { return m_unk10; } inline MxU32 GetUnknown10() { return m_unk10; }
inline void SetUnknown424(undefined4 p_unk424) { m_unk424 = p_unk424; } inline void SetUnknown424(undefined4 p_unk424) { m_unk424 = p_unk424; }
void SetSomeEnumState(undefined4 state); void SetSomeEnumState(undefined4 p_state);
private: private:
void RegisterState(LegoState* p_state); void RegisterState(LegoState* p_state);

5
LEGO1/legoomni.cpp
View File

@ -134,7 +134,7 @@ void LegoOmni::RemoveWorld(const MxAtomId& p1, MxLong p2)
} }
// OFFSET: LEGO1 0x1005b0c0 STUB // OFFSET: LEGO1 0x1005b0c0 STUB
LegoEntity* LegoOmni::FindByEntityIdOrAtomId(MxAtomId& p_atom, int p_entityid) LegoEntity* LegoOmni::FindByEntityIdOrAtomId(const MxAtomId& p_atom, MxS32 p_entityid)
{ {
// TODO // TODO
return NULL; return NULL;
@ -420,6 +420,7 @@ void LegoOmni::Init()
// OFFSET: LEGO1 0x1001a700 STUB // OFFSET: LEGO1 0x1001a700 STUB
void FUN_1001a700() void FUN_1001a700()
{ {
// TODO
} }
// OFFSET: LEGO1 0x10058e70 // OFFSET: LEGO1 0x10058e70
@ -530,7 +531,7 @@ MxBool LegoOmni::DoesEntityExist(MxDSAction& ds)
} }
// OFFSET: LEGO1 0x1005b2f0 // 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; LegoWorld* foundEntity = NULL;
if (strcmpi(p_id, g_current)) { if (strcmpi(p_id, g_current)) {

22
LEGO1/legoomni.h
View File

@ -83,18 +83,18 @@ class LegoOmni : public MxOmni {
return !strcmp(name, LegoOmni::ClassName()) || MxOmni::IsA(name); return !strcmp(name, LegoOmni::ClassName()) || MxOmni::IsA(name);
} }
virtual void Init() override; // vtable+14 virtual void Init() override; // vtable+14
virtual MxResult Create(MxOmniCreateParam& p) override; // vtable+18 virtual MxResult Create(MxOmniCreateParam& p) override; // vtable+18
virtual void Destroy() override; // vtable+1c virtual void Destroy() override; // vtable+1c
virtual MxResult Start(MxDSAction* action) override; // vtable+20 virtual MxResult Start(MxDSAction* action) override; // vtable+20
virtual MxResult DeleteObject(MxDSAction& ds) override; // vtable+24 virtual MxResult DeleteObject(MxDSAction& ds) override; // vtable+24
virtual MxBool DoesEntityExist(MxDSAction& ds) override; // vtable+28 virtual MxBool DoesEntityExist(MxDSAction& ds) override; // vtable+28
MxEntity* FindWorld(char* p_id, int p_entityId, MxCore* p_presenter) override; // vtable+30 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 NotifyCurrentEntity(MxNotificationParam* p_param) override; // vtable+34
virtual void StartTimer() override; // vtable+38 virtual void StartTimer() override; // vtable+38
virtual void StopTimer() override; // vtable+3c 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; } LegoVideoManager* GetVideoManager() { return (LegoVideoManager*) m_videoManager; }
LegoSoundManager* GetSoundManager() { return (LegoSoundManager*) m_soundManager; } LegoSoundManager* GetSoundManager() { return (LegoSoundManager*) m_soundManager; }

2
LEGO1/mxdsobject.h
View File

@ -35,7 +35,7 @@ class MxDSObject : public MxCore {
// OFFSET: LEGO1 0x10005530 // OFFSET: LEGO1 0x10005530
inline virtual void SetAtomId(MxAtomId p_atomId) { this->m_atomId = p_atomId; } // vtable+20; 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 MxU32 GetObjectId() { return this->m_objectId; }
inline MxS16 GetUnknown24() { return this->m_unk24; } inline MxS16 GetUnknown24() { return this->m_unk24; }

2
LEGO1/mxomni.cpp
View File

@ -92,7 +92,7 @@ void MxOmni::Vtable0x2c()
} }
// OFFSET: LEGO1 0x100aefb0 // OFFSET: LEGO1 0x100aefb0
MxEntity* MxOmni::FindWorld(char*, int, MxCore*) MxEntity* MxOmni::FindWorld(const char*, MxS32, MxCore*)
{ {
return NULL; return NULL;
} }

2
LEGO1/mxomni.h
View File

@ -46,7 +46,7 @@ class MxOmni : public MxCore {
virtual MxResult DeleteObject(MxDSAction& p_dsAction); // vtable+24 virtual MxResult DeleteObject(MxDSAction& p_dsAction); // vtable+24
virtual MxBool DoesEntityExist(MxDSAction& p_dsAction); // vtable+28 virtual MxBool DoesEntityExist(MxDSAction& p_dsAction); // vtable+28
virtual void Vtable0x2c(); // vtable+2c 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 NotifyCurrentEntity(MxNotificationParam* p_param); // vtable+34
virtual void StartTimer(); // vtable+38 virtual void StartTimer(); // vtable+38
virtual void StopTimer(); // vtable+3c virtual void StopTimer(); // vtable+3c