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

Use MxS32

Browse Source
This commit is contained in:
Anonymous Maarten 2024-02-03 00:24:34 +01:00
parent 39f62ead00
commit 2af3612152
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
LEGO1/lego/legoomni/include/act1state.h
View File

@ -11,6 +11,12 @@ class LegoTexture;
// SIZE 0x26c // SIZE 0x26c
class Act1State : public LegoState { class Act1State : public LegoState {
public: public:
enum {
e_unk953 = 953,
e_unk954 = 954,
e_unk955 = 955,
};
Act1State(); Act1State();
// FUNCTION: LEGO1 0x100338a0 // FUNCTION: LEGO1 0x100338a0
@ -50,7 +56,7 @@ class Act1State : public LegoState {
inline void SetName(const char* p_name) { m_name = p_name; } inline void SetName(const char* p_name) { m_name = p_name; }
inline const MxString* GetName() const { return &m_name; } inline const MxString* GetName() const { return &m_name; }
int Serialize(LegoFile* p_file); MxS32 Serialize(LegoFile* p_file);
private: private:
MxString m_name; // 0x00 MxString m_name; // 0x00
@ -73,7 +79,7 @@ class Act1State : public LegoState {
}; };
protected: protected:
int* m_unk0x008; // 0x008 MxS32* m_unk0x008; // 0x008
// FIXME: count for m_unk0x008 // FIXME: count for m_unk0x008
MxS16 m_unk0x00c; // 0x00c MxS16 m_unk0x00c; // 0x00c
undefined2 m_unk0x00e; // 0x00e undefined2 m_unk0x00e; // 0x00e

16
LEGO1/lego/legoomni/src/act1/act1state.cpp
View File

@ -9,17 +9,11 @@ Act1State::NamedTexture* ReadNamedTexture(LegoFile* p_file);
void WriteNamedTexture(LegoFile* p_file, Act1State::NamedTexture* p_texture); void WriteNamedTexture(LegoFile* p_file, Act1State::NamedTexture* p_texture);
void FUN_1003f540(LegoFile* p_file, const char* p_filename); void FUN_1003f540(LegoFile* p_file, const char* p_filename);
enum {
e_unk953 = 953,
e_unk954 = 954,
e_unk955 = 955,
};
// GLOBAL: ISLE 0x100f37f0 // GLOBAL: ISLE 0x100f37f0
int g_unk0x100f37f0[] = { MxS32 g_unk0x100f37f0[] = {
e_unk953, Act1State::e_unk953,
e_unk954, Act1State::e_unk954,
e_unk955, Act1State::e_unk955,
}; };
// STUB: LEGO1 0x100334b0 // STUB: LEGO1 0x100334b0
@ -185,7 +179,7 @@ MxResult Act1State::VTable0x1c(LegoFile* p_legoFile)
} }
// FUNCTION: LEGO1 0x100344d0 // FUNCTION: LEGO1 0x100344d0
int Act1State::NamedPlane::Serialize(LegoFile* p_file) MxS32 Act1State::NamedPlane::Serialize(LegoFile* p_file)
{ {
if (p_file->IsWriteMode()) { if (p_file->IsWriteMode()) {
p_file->FUN_10006030(m_name); p_file->FUN_10006030(m_name);