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

Fix some parameters

Browse Source
This commit is contained in:
Christian Semmler 2023-12-12 06:29:33 -05:00
parent f285ad6c2c
commit d11973eadd
14 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/legogamestate.h
View File

@ -35,7 +35,7 @@ class LegoGameState {
void HandleAction(MxU32 p_unk); void HandleAction(MxU32 p_unk);
inline MxU32 GetUnknown10() { return m_unk0x10; } inline MxU32 GetUnknown10() { return m_unk0x10; }
inline void SetUnknown424(undefined4 p_unk424) { m_unk0x424 = p_unk424; } inline void SetUnknown424(undefined4 p_unk0x424) { m_unk0x424 = p_unk0x424; }
void SetSomeEnumState(undefined4 p_state); void SetSomeEnumState(undefined4 p_state);

4
LEGO1/mxdsaction.cpp
View File

@ -205,9 +205,9 @@ void MxDSAction::AppendData(MxU16 p_extraLength, const char* p_extraData)
} }
// FUNCTION: LEGO1 0x100adf70 // FUNCTION: LEGO1 0x100adf70
void MxDSAction::Deserialize(char** p_source, MxS16 p_unk24) void MxDSAction::Deserialize(char** p_source, MxS16 p_unk0x24)
{ {
MxDSObject::Deserialize(p_source, p_unk24); MxDSObject::Deserialize(p_source, p_unk0x24);
GetScalar(p_source, this->m_flags); GetScalar(p_source, this->m_flags);
GetScalar(p_source, this->m_startTime); GetScalar(p_source, this->m_startTime);

22
LEGO1/mxdsaction.h
View File

@ -42,16 +42,16 @@ class MxDSAction : public MxDSObject {
return !strcmp(p_name, MxDSAction::ClassName()) || MxDSObject::IsA(p_name); return !strcmp(p_name, MxDSAction::ClassName()) || MxDSObject::IsA(p_name);
} }
virtual MxU32 GetSizeOnDisk() override; // vtable+18; virtual MxU32 GetSizeOnDisk() override; // vtable+18;
virtual void Deserialize(char** p_source, MxS16 p_unk24) override; // vtable+1c; virtual void Deserialize(char** p_source, MxS16 p_unk0x24) override; // vtable+1c;
virtual MxLong GetDuration(); // vtable+24; virtual MxLong GetDuration(); // vtable+24;
virtual void SetDuration(MxLong p_duration); // vtable+28; virtual void SetDuration(MxLong p_duration); // vtable+28;
virtual MxDSAction* Clone(); // vtable+2c; virtual MxDSAction* Clone(); // vtable+2c;
virtual void MergeFrom(MxDSAction& p_dsAction); // vtable+30; virtual void MergeFrom(MxDSAction& p_dsAction); // vtable+30;
virtual MxBool HasId(MxU32 p_objectId); // vtable+34; virtual MxBool HasId(MxU32 p_objectId); // vtable+34;
virtual void SetUnkTimingField(MxLong p_unkTimingField); // vtable+38; virtual void SetUnkTimingField(MxLong p_unkTimingField); // vtable+38;
virtual MxLong GetUnkTimingField(); // vtable+3c; virtual MxLong GetUnkTimingField(); // vtable+3c;
virtual MxLong GetElapsedTime(); // vtable+40; virtual MxLong GetElapsedTime(); // vtable+40;
void AppendData(MxU16 p_extraLength, const char* p_extraData); void AppendData(MxU16 p_extraLength, const char* p_extraData);
@ -63,7 +63,7 @@ class MxDSAction : public MxDSObject {
inline MxS32 GetLoopCount() { return m_loopCount; } inline MxS32 GetLoopCount() { return m_loopCount; }
inline void SetLoopCount(MxS32 p_loopCount) { m_loopCount = p_loopCount; } inline void SetLoopCount(MxS32 p_loopCount) { m_loopCount = p_loopCount; }
inline const Vector3Data& GetLocation() const { return m_location; } inline const Vector3Data& GetLocation() const { return m_location; }
inline void SetUnknown84(MxCore* p_unk84) { m_unk0x84 = p_unk84; } inline void SetUnknown84(MxCore* p_unk0x84) { m_unk0x84 = p_unk0x84; }
inline MxCore* GetOrigin() { return m_origin; } inline MxCore* GetOrigin() { return m_origin; }
inline void SetOrigin(MxCore* p_origin) { m_origin = p_origin; } inline void SetOrigin(MxCore* p_origin) { m_origin = p_origin; }

4
LEGO1/mxdsmediaaction.cpp
View File

@ -80,9 +80,9 @@ MxU32 MxDSMediaAction::GetSizeOnDisk()
} }
// FUNCTION: LEGO1 0x100c8f60 // FUNCTION: LEGO1 0x100c8f60
void MxDSMediaAction::Deserialize(char** p_source, MxS16 p_unk24) void MxDSMediaAction::Deserialize(char** p_source, MxS16 p_unk0x24)
{ {
MxDSAction::Deserialize(p_source, p_unk24); MxDSAction::Deserialize(p_source, p_unk0x24);
GetString(p_source, this->m_mediaSrcPath, this, &MxDSMediaAction::CopyMediaSrcPath); GetString(p_source, this->m_mediaSrcPath, this, &MxDSMediaAction::CopyMediaSrcPath);
GetScalar(p_source, this->m_unk0x9c.m_unk0x00); GetScalar(p_source, this->m_unk0x9c.m_unk0x00);

4
LEGO1/mxdsmediaaction.h
View File

@ -28,8 +28,8 @@ class MxDSMediaAction : public MxDSAction {
return !strcmp(p_name, MxDSMediaAction::ClassName()) || MxDSAction::IsA(p_name); return !strcmp(p_name, MxDSMediaAction::ClassName()) || MxDSAction::IsA(p_name);
} }
virtual MxU32 GetSizeOnDisk() override; // vtable+18; virtual MxU32 GetSizeOnDisk() override; // vtable+18;
virtual void Deserialize(char** p_source, MxS16 p_unk24) override; // vtable+1c; virtual void Deserialize(char** p_source, MxS16 p_unk0x24) override; // vtable+1c;
void CopyMediaSrcPath(const char* p_mediaSrcPath); void CopyMediaSrcPath(const char* p_mediaSrcPath);

6
LEGO1/mxdsmultiaction.cpp
View File

@ -130,9 +130,9 @@ MxU32 MxDSMultiAction::GetSizeOnDisk()
} }
// FUNCTION: LEGO1 0x100ca7b0 // FUNCTION: LEGO1 0x100ca7b0
void MxDSMultiAction::Deserialize(char** p_source, MxS16 p_unk24) void MxDSMultiAction::Deserialize(char** p_source, MxS16 p_unk0x24)
{ {
MxDSAction::Deserialize(p_source, p_unk24); MxDSAction::Deserialize(p_source, p_unk0x24);
MxU32 extraFlag = *(MxU32*) (*p_source + 4) & 1; MxU32 extraFlag = *(MxU32*) (*p_source + 4) & 1;
*p_source += 12; *p_source += 12;
@ -145,7 +145,7 @@ void MxDSMultiAction::Deserialize(char** p_source, MxS16 p_unk24)
MxU32 extraFlag = *(MxU32*) (*p_source + 4) & 1; MxU32 extraFlag = *(MxU32*) (*p_source + 4) & 1;
*p_source += 8; *p_source += 8;
MxDSAction* action = (MxDSAction*) DeserializeDSObjectDispatch(p_source, p_unk24); MxDSAction* action = (MxDSAction*) DeserializeDSObjectDispatch(p_source, p_unk0x24);
*p_source += extraFlag; *p_source += extraFlag;
this->m_actions->Append(action); this->m_actions->Append(action);

16
LEGO1/mxdsmultiaction.h
View File

@ -27,14 +27,14 @@ class MxDSMultiAction : public MxDSAction {
return !strcmp(p_name, MxDSMultiAction::ClassName()) || MxDSAction::IsA(p_name); return !strcmp(p_name, MxDSMultiAction::ClassName()) || MxDSAction::IsA(p_name);
} }
virtual undefined4 unk14() override; // vtable+14; virtual undefined4 unk14() override; // vtable+14;
virtual MxU32 GetSizeOnDisk() override; // vtable+18; virtual MxU32 GetSizeOnDisk() override; // vtable+18;
virtual void Deserialize(char** p_source, MxS16 p_unk24) override; // vtable+1c; virtual void Deserialize(char** p_source, MxS16 p_unk0x24) override; // vtable+1c;
virtual void SetAtomId(MxAtomId p_atomId) override; // vtable+20; virtual void SetAtomId(MxAtomId p_atomId) override; // vtable+20;
virtual MxDSAction* Clone() override; // vtable+2c; virtual MxDSAction* Clone() override; // vtable+2c;
virtual void MergeFrom(MxDSAction& p_dsAction) override; // vtable+30; virtual void MergeFrom(MxDSAction& p_dsAction) override; // vtable+30;
virtual MxBool HasId(MxU32 p_objectId) override; // vtable+34; virtual MxBool HasId(MxU32 p_objectId) override; // vtable+34;
virtual void SetUnkTimingField(MxLong p_unkTimingField) override; // vtable+38; virtual void SetUnkTimingField(MxLong p_unkTimingField) override; // vtable+38;
inline MxDSActionList* GetActionList() const { return m_actions; }; inline MxDSActionList* GetActionList() const { return m_actions; };

4
LEGO1/mxdsobject.cpp
View File

@ -127,14 +127,14 @@ MxU32 MxDSObject::GetSizeOnDisk()
} }
// FUNCTION: LEGO1 0x100bfa20 // FUNCTION: LEGO1 0x100bfa20
void MxDSObject::Deserialize(char** p_source, MxS16 p_unk24) void MxDSObject::Deserialize(char** p_source, MxS16 p_unk0x24)
{ {
GetString(p_source, this->m_sourceName, this, &MxDSObject::SetSourceName); GetString(p_source, this->m_sourceName, this, &MxDSObject::SetSourceName);
GetScalar(p_source, this->m_unk0x14); GetScalar(p_source, this->m_unk0x14);
GetString(p_source, this->m_objectName, this, &MxDSObject::SetObjectName); GetString(p_source, this->m_objectName, this, &MxDSObject::SetObjectName);
GetScalar(p_source, this->m_objectId); GetScalar(p_source, this->m_objectId);
this->m_unk0x24 = p_unk24; this->m_unk0x24 = p_unk0x24;
} }
// FUNCTION: LEGO1 0x100bfb30 // FUNCTION: LEGO1 0x100bfb30

4
LEGO1/mxdsobject.h
View File

@ -34,7 +34,7 @@ class MxDSObject : public MxCore {
virtual undefined4 unk14(); // vtable+14; virtual undefined4 unk14(); // vtable+14;
virtual MxU32 GetSizeOnDisk(); // vtable+18; virtual MxU32 GetSizeOnDisk(); // vtable+18;
virtual void Deserialize(char** p_source, MxS16 p_unk24); // vtable+1c; virtual void Deserialize(char** p_source, MxS16 p_unk0x24); // vtable+1c;
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 MxDSType GetType() const { return (MxDSType) this->m_type; } inline MxDSType GetType() const { return (MxDSType) this->m_type; }
@ -45,7 +45,7 @@ class MxDSObject : public MxCore {
inline void SetType(MxDSType p_type) { this->m_type = p_type; } inline void SetType(MxDSType p_type) { this->m_type = p_type; }
inline void SetObjectId(MxU32 p_objectId) { this->m_objectId = p_objectId; } inline void SetObjectId(MxU32 p_objectId) { this->m_objectId = p_objectId; }
inline void SetUnknown24(MxS16 p_unk24) { this->m_unk0x24 = p_unk24; } inline void SetUnknown24(MxS16 p_unk0x24) { this->m_unk0x24 = p_unk0x24; }
private: private:
MxU32 m_sizeOnDisk; // 0x8 MxU32 m_sizeOnDisk; // 0x8

6
LEGO1/mxdsselectaction.cpp
View File

@ -86,10 +86,10 @@ MxU32 MxDSSelectAction::GetSizeOnDisk()
} }
// FUNCTION: LEGO1 0x100cbf60 // FUNCTION: LEGO1 0x100cbf60
void MxDSSelectAction::Deserialize(char** p_source, MxS16 p_unk24) void MxDSSelectAction::Deserialize(char** p_source, MxS16 p_unk0x24)
{ {
MxString string; MxString string;
MxDSAction::Deserialize(p_source, p_unk24); MxDSAction::Deserialize(p_source, p_unk0x24);
MxU32 extraFlag = *(MxU32*) (*p_source + 4) & 1; MxU32 extraFlag = *(MxU32*) (*p_source + 4) & 1;
*p_source += 12; *p_source += 12;
@ -129,7 +129,7 @@ void MxDSSelectAction::Deserialize(char** p_source, MxS16 p_unk24)
MxU32 extraFlag = *(MxU32*) (*p_source + 4) & 1; MxU32 extraFlag = *(MxU32*) (*p_source + 4) & 1;
*p_source += 8; *p_source += 8;
MxDSAction* action = (MxDSAction*) DeserializeDSObjectDispatch(p_source, p_unk24); MxDSAction* action = (MxDSAction*) DeserializeDSObjectDispatch(p_source, p_unk0x24);
if (index == i) if (index == i)
this->m_actions->Append(action); this->m_actions->Append(action);

6
LEGO1/mxdsselectaction.h
View File

@ -28,9 +28,9 @@ class MxDSSelectAction : public MxDSParallelAction {
return !strcmp(p_name, MxDSSelectAction::ClassName()) || MxDSParallelAction::IsA(p_name); return !strcmp(p_name, MxDSSelectAction::ClassName()) || MxDSParallelAction::IsA(p_name);
} }
virtual MxU32 GetSizeOnDisk() override; // vtable+18; virtual MxU32 GetSizeOnDisk() override; // vtable+18;
virtual void Deserialize(char** p_source, MxS16 p_unk24) override; // vtable+1c; virtual void Deserialize(char** p_source, MxS16 p_unk0x24) override; // vtable+1c;
virtual MxDSAction* Clone() override; // vtable+2c; virtual MxDSAction* Clone() override; // vtable+2c;
private: private:
MxString m_unk0x9c; MxString m_unk0x9c;

4
LEGO1/mxdssound.cpp
View File

@ -46,9 +46,9 @@ MxDSAction* MxDSSound::Clone()
} }
// FUNCTION: LEGO1 0x100c95a0 // FUNCTION: LEGO1 0x100c95a0
void MxDSSound::Deserialize(char** p_source, MxS16 p_unk24) void MxDSSound::Deserialize(char** p_source, MxS16 p_unk0x24)
{ {
MxDSMediaAction::Deserialize(p_source, p_unk24); MxDSMediaAction::Deserialize(p_source, p_unk0x24);
GetScalar(p_source, this->m_volume); GetScalar(p_source, this->m_volume);
} }

6
LEGO1/mxdssound.h
View File

@ -26,9 +26,9 @@ class MxDSSound : public MxDSMediaAction {
return !strcmp(p_name, MxDSSound::ClassName()) || MxDSMediaAction::IsA(p_name); return !strcmp(p_name, MxDSSound::ClassName()) || MxDSMediaAction::IsA(p_name);
} }
virtual MxU32 GetSizeOnDisk() override; // vtable+18; virtual MxU32 GetSizeOnDisk() override; // vtable+18;
virtual void Deserialize(char** p_source, MxS16 p_unk24) override; // vtable+1c; virtual void Deserialize(char** p_source, MxS16 p_unk0x24) override; // vtable+1c;
virtual MxDSAction* Clone() override; // vtable+2c; virtual MxDSAction* Clone() override; // vtable+2c;
inline MxS32 GetVolume() const { return m_volume; } inline MxS32 GetVolume() const { return m_volume; }

8
LEGO1/mxnextactiondatastart.h
View File

@ -8,10 +8,10 @@
class MxNextActionDataStart : public MxCore { class MxNextActionDataStart : public MxCore {
public: public:
// inlined constructor at 0x100c1847 // inlined constructor at 0x100c1847
inline MxNextActionDataStart(MxU32 p_objectId, MxS16 p_unk24val, MxU32 p_data) inline MxNextActionDataStart(MxU32 p_objectId, MxS16 p_unk0x24, MxU32 p_data)
{ {
m_objectId = p_objectId; m_objectId = p_objectId;
m_unk0x24val = p_unk24val; m_unk0x24 = p_unk0x24;
m_data = p_data; m_data = p_data;
} }
@ -29,11 +29,11 @@ class MxNextActionDataStart : public MxCore {
} }
inline MxU32 GetObjectId() const { return m_objectId; } inline MxU32 GetObjectId() const { return m_objectId; }
inline MxS16 GetUnknown24() const { return m_unk0x24val; } inline MxS16 GetUnknown24() const { return m_unk0x24; }
private: private:
MxU32 m_objectId; MxU32 m_objectId;
MxS16 m_unk0x24val; MxS16 m_unk0x24;
MxU32 m_data; MxU32 m_data;
}; };