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

Implement LegoState::Playlist (#517)

Browse Source
This commit is contained in:
Christian Semmler
2024-02-02 14:09:45 -05:00
committed by GitHub
parent 558bda4dd2
commit b7e274f902
8 changed files with 104 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
LEGO1/lego/legoomni/include/infocenterstate.h
View File

@@ -30,9 +30,9 @@ public:
inline MxS16 GetInfocenterBufferSize() { return sizeof(m_buffer) / sizeof(m_buffer[0]); }
inline MxStillPresenter* GetInfocenterBufferElement(MxS32 p_index) { return m_buffer[p_index]; }
inline Shuffle& GetUnknown0x08() { return m_unk0x08; }
inline Shuffle& GetUnknown0x14() { return m_unk0x14; }
inline Shuffle& GetUnknown0x68() { return m_unk0x68; }
inline Playlist& GetUnknown0x08() { return m_unk0x08; }
inline Playlist& GetUnknown0x14() { return m_unk0x14; }
inline Playlist& GetUnknown0x68() { return m_unk0x68; }
inline MxU32 GetUnknown0x74() { return m_unk0x74; }
inline void SetUnknown0x74(MxU32 p_unk0x74) { m_unk0x74 = p_unk0x74; }
@@ -41,11 +41,11 @@ public:
// InfocenterState::`scalar deleting destructor'
private:
Shuffle m_unk0x08; // 0x08
Shuffle m_unk0x14; // 0x14
Shuffle m_unk0x20[3]; // 0x20
Shuffle m_unk0x44[3]; // 0x44
Shuffle m_unk0x68; // 0x68
Playlist m_unk0x08; // 0x08
Playlist m_unk0x14; // 0x14
Playlist m_unk0x20[3]; // 0x20
Playlist m_unk0x44[3]; // 0x44
Playlist m_unk0x68; // 0x68
MxU32 m_unk0x74; // 0x74
MxStillPresenter* m_buffer[7]; // 0x78
};

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

@@ -45,45 +45,52 @@ public:
// LegoState::`scalar deleting destructor'
// SIZE 0x0c
class Shuffle {
class Playlist {
public:
enum Mode {
e_loop,
e_once,
e_random,
e_loopSkipFirst
};
// FUNCTION: LEGO1 0x10017c00
Shuffle()
Playlist()
{
m_objectIds = NULL;
m_length = 0;
m_unk0x06 = 0;
m_unk0x08 = 0;
m_mode = e_loop;
m_nextIndex = 0;
}
Shuffle(MxU32* p_objectIds, MxU16 p_length)
Playlist(MxU32* p_objectIds, MxS16 p_length)
{
m_objectIds = p_objectIds;
m_length = p_length;
m_unk0x06 = 0;
m_unk0x08 = 0;
m_mode = e_loop;
m_nextIndex = 0;
}
// FUNCTION: LEGO1 0x10071800
Shuffle& operator=(const Shuffle& p_shuffle)
Playlist& operator=(const Playlist& p_shuffle)
{
m_objectIds = p_shuffle.m_objectIds;
m_length = p_shuffle.m_length;
m_unk0x08 = p_shuffle.m_unk0x08;
m_unk0x06 = p_shuffle.m_unk0x06;
m_nextIndex = p_shuffle.m_nextIndex;
m_mode = p_shuffle.m_mode;
return *this;
}
MxU32 FUN_10014d00();
MxBool FUN_10014de0(MxU32 p_objectId);
MxU32 Next();
MxBool Contains(MxU32 p_objectId);
inline void SetUnknown0x08(MxU16 p_unk0x08) { m_unk0x08 = p_unk0x08; }
inline void SetUnknown0x08(MxS16 p_unk0x08) { m_nextIndex = p_unk0x08; }
private:
MxU32* m_objectIds; // 0x00
MxU16 m_length; // 0x04
undefined2 m_unk0x06; // 0x06
MxU16 m_unk0x08; // 0x08
MxU32* m_objectIds; // 0x00
MxS16 m_length; // 0x04
MxS16 m_mode; // 0x06
MxS16 m_nextIndex; // 0x08
};
};

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

@@ -29,7 +29,7 @@ public:
// LegoVehicleBuildState::`scalar deleting destructor'
private:
Shuffle m_unk0x08[4]; // 0x08
Playlist m_unk0x08[4]; // 0x08
// This can be one of the following:
// * LegoRaceCarBuildState

6
LEGO1/lego/legoomni/include/radiostate.h
View File

@@ -36,9 +36,9 @@ public:
MxBool FUN_1002d0c0(const MxAtomId& p_atom, MxU32 p_objectId);
private:
Shuffle m_unk0x08[3]; // 0x08
MxS16 m_unk0x2c; // 0x2c
MxBool m_active; // 0x2e
Playlist m_unk0x08[3]; // 0x08
MxS16 m_unk0x2c; // 0x2c
MxBool m_active; // 0x2e
};
#endif // RADIOSTATE_H