mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement/match LegoOmni::GetScriptIndex (#571)

Browse Source 
* Implement/match LegoOmni::GetScriptIndex

* Fix type

* Fix
This commit is contained in:
Christian Semmler
2024-02-16 20:10:42 -05:00
committed by GitHub
parent c67f613b8d
commit b47412183b
9 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/include/legoanimationmanager.h
View File

@@ -31,7 +31,7 @@ public:
void FUN_1005ef10();
void FUN_1005f0b0();
void FUN_1005f6d0(MxBool);
void FUN_1005f720(undefined4);
void FUN_1005f720(MxS32 p_scriptIndex);
void FUN_10061010(undefined4);
void FUN_10064670(MxBool);

5
LEGO1/lego/legoomni/include/legoomni.h
View File

@@ -98,6 +98,9 @@ public:
return *this;
}
inline MxS32 GetIndex() { return m_index; }
inline const char* GetKey() { return m_key; }
private:
MxS32 m_index; // 0x00
char m_key[20]; // 0x04
@@ -200,7 +203,7 @@ public:
void CreateBackgroundAudio();
void RemoveWorld(const MxAtomId&, MxLong);
MxResult RegisterScripts();
undefined4 FUN_1005b490(char* p_worldName);
MxS32 GetScriptIndex(const char* p_key);
static MxS32 GetCurrPathInfo(LegoPathBoundary**, MxS32&);
static void CreateInstance();

2
LEGO1/lego/legoomni/include/legoplantmanager.h
View File

@@ -20,7 +20,7 @@ public:
return "LegoPlantManager";
}
void FUN_10026360(undefined4 p_world);
void FUN_10026360(MxS32 p_scriptIndex);
void FUN_100263a0(undefined4 p_und);
void FUN_10027120();

7
LEGO1/lego/legoomni/include/legoworld.h
View File

@@ -65,11 +65,12 @@ public:
virtual void Enable(MxBool p_enable); // vtable+0x68
inline LegoCameraController* GetCamera() { return m_cameraController; }
inline void SetUnknown0xec(undefined4 p_unk0xec) { m_unk0xec = p_unk0xec; }
inline undefined4 GetUnknown0xec() { return m_unk0xec; }
inline MxS32 GetScriptIndex() { return m_scriptIndex; }
inline MxCoreSet& GetUnknown0xd0() { return m_set0xd0; }
inline list<AutoROI*>& GetUnknownList0xe0() { return m_list0xe0; }
inline void SetScriptIndex(MxS32 p_scriptIndex) { m_scriptIndex = p_scriptIndex; }
MxBool PresentersPending();
void Remove(MxCore* p_object);
void FUN_1001fc80(IslePathActor* p_actor);
@@ -91,7 +92,7 @@ protected:
MxPresenterList m_controlPresenters; // 0xb8
MxCoreSet m_set0xd0; // 0xd0
list<AutoROI*> m_list0xe0; // 0xe0
undefined4 m_unk0xec; // 0xec
MxS32 m_scriptIndex; // 0xec
LegoHideAnimPresenter* m_hideAnimPresenter; // 0xf0
MxS16 m_startupTicks; // 0xf4
MxBool m_worldStarted; // 0xf6