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 PizzeriaState::PizzeriaState (#1124)

Browse Source
This commit is contained in:
Christian Semmler
2024-10-28 10:32:55 -07:00
committed by GitHub
parent ad353b7f3e
commit 5f822dabc7
5 changed files with 63 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
LEGO1/lego/legoomni/include/legostate.h
View File

@@ -27,6 +27,7 @@ public:
};
// FUNCTION: LEGO1 0x10017c00
// FUNCTION: BETA10 0x10031dc0
Playlist()
{
m_objectIds = NULL;
@@ -35,28 +36,30 @@ public:
m_nextIndex = 0;
}
Playlist(MxU32* p_objectIds, MxS16 p_length)
// FUNCTION: BETA10 0x10031e10
Playlist(MxU32* p_objectIds, MxS16 p_length, MxS16 p_mode)
{
m_objectIds = p_objectIds;
m_length = p_length;
m_mode = e_loop;
m_mode = p_mode;
m_nextIndex = 0;
}
// FUNCTION: LEGO1 0x10071800
Playlist& operator=(const Playlist& p_shuffle)
// FUNCTION: BETA10 0x10031e70
Playlist& operator=(const Playlist& p_playlist)
{
m_objectIds = p_shuffle.m_objectIds;
m_length = p_shuffle.m_length;
m_nextIndex = p_shuffle.m_nextIndex;
m_mode = p_shuffle.m_mode;
m_objectIds = p_playlist.m_objectIds;
m_length = p_playlist.m_length;
m_nextIndex = p_playlist.m_nextIndex;
m_mode = p_playlist.m_mode;
return *this;
}
MxU32 Next();
MxBool Contains(MxU32 p_objectId);
void SetUnknown0x08(MxS16 p_unk0x08) { m_nextIndex = p_unk0x08; }
void SetNextIndex(MxS16 p_nextIndex) { m_nextIndex = p_nextIndex; }
MxResult ReadFromFile(LegoFile* p_file)
{

13
LEGO1/lego/legoomni/include/pizzeria.h
View File

@@ -11,15 +11,6 @@ class PizzaMissionState;
// SIZE 0x58
class PizzeriaState : public LegoState {
public:
// SIZE 0x14
struct StateStruct {
undefined4 m_unk0x00; // 0x00
undefined4 m_unk0x04; // 0x04
undefined4 m_unk0x08; // 0x08
undefined4 m_unk0x0c; // 0x0c
undefined4 m_unk0x10; // 0x10
};
PizzeriaState();
// FUNCTION: LEGO1 0x10017c20
@@ -45,8 +36,8 @@ public:
// TODO: Most likely getters/setters are not used according to BETA.
Playlist m_unk0x08[5]; // 0x08
StateStruct m_unk0x44; // 0x44
Playlist m_unk0x08[5]; // 0x08
undefined4 m_unk0x44[5]; // 0x44
};
// VTABLE: LEGO1 0x100d5520