diff --git a/LEGO1/legogamestate.h b/LEGO1/legogamestate.h index f2c78595..42ad1d05 100644 --- a/LEGO1/legogamestate.h +++ b/LEGO1/legogamestate.h @@ -35,7 +35,7 @@ class LegoGameState { void HandleAction(MxU32 p_unk); 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); diff --git a/LEGO1/mxdsaction.cpp b/LEGO1/mxdsaction.cpp index 12679f73..f75ca17b 100644 --- a/LEGO1/mxdsaction.cpp +++ b/LEGO1/mxdsaction.cpp @@ -205,9 +205,9 @@ void MxDSAction::AppendData(MxU16 p_extraLength, const char* p_extraData) } // 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_startTime); diff --git a/LEGO1/mxdsaction.h b/LEGO1/mxdsaction.h index 58a2184d..c3835146 100644 --- a/LEGO1/mxdsaction.h +++ b/LEGO1/mxdsaction.h @@ -42,16 +42,16 @@ class MxDSAction : public MxDSObject { return !strcmp(p_name, MxDSAction::ClassName()) || MxDSObject::IsA(p_name); } - virtual MxU32 GetSizeOnDisk() override; // vtable+18; - virtual void Deserialize(char** p_source, MxS16 p_unk24) override; // vtable+1c; - virtual MxLong GetDuration(); // vtable+24; - virtual void SetDuration(MxLong p_duration); // vtable+28; - virtual MxDSAction* Clone(); // vtable+2c; - virtual void MergeFrom(MxDSAction& p_dsAction); // vtable+30; - virtual MxBool HasId(MxU32 p_objectId); // vtable+34; - virtual void SetUnkTimingField(MxLong p_unkTimingField); // vtable+38; - virtual MxLong GetUnkTimingField(); // vtable+3c; - virtual MxLong GetElapsedTime(); // vtable+40; + virtual MxU32 GetSizeOnDisk() override; // vtable+18; + virtual void Deserialize(char** p_source, MxS16 p_unk0x24) override; // vtable+1c; + virtual MxLong GetDuration(); // vtable+24; + virtual void SetDuration(MxLong p_duration); // vtable+28; + virtual MxDSAction* Clone(); // vtable+2c; + virtual void MergeFrom(MxDSAction& p_dsAction); // vtable+30; + virtual MxBool HasId(MxU32 p_objectId); // vtable+34; + virtual void SetUnkTimingField(MxLong p_unkTimingField); // vtable+38; + virtual MxLong GetUnkTimingField(); // vtable+3c; + virtual MxLong GetElapsedTime(); // vtable+40; void AppendData(MxU16 p_extraLength, const char* p_extraData); @@ -63,7 +63,7 @@ class MxDSAction : public MxDSObject { inline MxS32 GetLoopCount() { return m_loopCount; } inline void SetLoopCount(MxS32 p_loopCount) { m_loopCount = p_loopCount; } 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 void SetOrigin(MxCore* p_origin) { m_origin = p_origin; } diff --git a/LEGO1/mxdsmediaaction.cpp b/LEGO1/mxdsmediaaction.cpp index 066cb66c..d5d7446a 100644 --- a/LEGO1/mxdsmediaaction.cpp +++ b/LEGO1/mxdsmediaaction.cpp @@ -80,9 +80,9 @@ MxU32 MxDSMediaAction::GetSizeOnDisk() } // 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); GetScalar(p_source, this->m_unk0x9c.m_unk0x00); diff --git a/LEGO1/mxdsmediaaction.h b/LEGO1/mxdsmediaaction.h index b6975776..27965be9 100644 --- a/LEGO1/mxdsmediaaction.h +++ b/LEGO1/mxdsmediaaction.h @@ -28,8 +28,8 @@ class MxDSMediaAction : public MxDSAction { return !strcmp(p_name, MxDSMediaAction::ClassName()) || MxDSAction::IsA(p_name); } - virtual MxU32 GetSizeOnDisk() override; // vtable+18; - virtual void Deserialize(char** p_source, MxS16 p_unk24) override; // vtable+1c; + virtual MxU32 GetSizeOnDisk() override; // vtable+18; + virtual void Deserialize(char** p_source, MxS16 p_unk0x24) override; // vtable+1c; void CopyMediaSrcPath(const char* p_mediaSrcPath); diff --git a/LEGO1/mxdsmultiaction.cpp b/LEGO1/mxdsmultiaction.cpp index 38c4433c..730839ac 100644 --- a/LEGO1/mxdsmultiaction.cpp +++ b/LEGO1/mxdsmultiaction.cpp @@ -130,9 +130,9 @@ MxU32 MxDSMultiAction::GetSizeOnDisk() } // 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; *p_source += 12; @@ -145,7 +145,7 @@ void MxDSMultiAction::Deserialize(char** p_source, MxS16 p_unk24) MxU32 extraFlag = *(MxU32*) (*p_source + 4) & 1; *p_source += 8; - MxDSAction* action = (MxDSAction*) DeserializeDSObjectDispatch(p_source, p_unk24); + MxDSAction* action = (MxDSAction*) DeserializeDSObjectDispatch(p_source, p_unk0x24); *p_source += extraFlag; this->m_actions->Append(action); diff --git a/LEGO1/mxdsmultiaction.h b/LEGO1/mxdsmultiaction.h index 92cf8829..2603ad02 100644 --- a/LEGO1/mxdsmultiaction.h +++ b/LEGO1/mxdsmultiaction.h @@ -27,14 +27,14 @@ class MxDSMultiAction : public MxDSAction { return !strcmp(p_name, MxDSMultiAction::ClassName()) || MxDSAction::IsA(p_name); } - virtual undefined4 unk14() override; // vtable+14; - virtual MxU32 GetSizeOnDisk() override; // vtable+18; - virtual void Deserialize(char** p_source, MxS16 p_unk24) override; // vtable+1c; - virtual void SetAtomId(MxAtomId p_atomId) override; // vtable+20; - virtual MxDSAction* Clone() override; // vtable+2c; - virtual void MergeFrom(MxDSAction& p_dsAction) override; // vtable+30; - virtual MxBool HasId(MxU32 p_objectId) override; // vtable+34; - virtual void SetUnkTimingField(MxLong p_unkTimingField) override; // vtable+38; + virtual undefined4 unk14() override; // vtable+14; + virtual MxU32 GetSizeOnDisk() override; // vtable+18; + virtual void Deserialize(char** p_source, MxS16 p_unk0x24) override; // vtable+1c; + virtual void SetAtomId(MxAtomId p_atomId) override; // vtable+20; + virtual MxDSAction* Clone() override; // vtable+2c; + virtual void MergeFrom(MxDSAction& p_dsAction) override; // vtable+30; + virtual MxBool HasId(MxU32 p_objectId) override; // vtable+34; + virtual void SetUnkTimingField(MxLong p_unkTimingField) override; // vtable+38; inline MxDSActionList* GetActionList() const { return m_actions; }; diff --git a/LEGO1/mxdsobject.cpp b/LEGO1/mxdsobject.cpp index e7f23d11..67e50247 100644 --- a/LEGO1/mxdsobject.cpp +++ b/LEGO1/mxdsobject.cpp @@ -127,14 +127,14 @@ MxU32 MxDSObject::GetSizeOnDisk() } // 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); GetScalar(p_source, this->m_unk0x14); GetString(p_source, this->m_objectName, this, &MxDSObject::SetObjectName); GetScalar(p_source, this->m_objectId); - this->m_unk0x24 = p_unk24; + this->m_unk0x24 = p_unk0x24; } // FUNCTION: LEGO1 0x100bfb30 diff --git a/LEGO1/mxdsobject.h b/LEGO1/mxdsobject.h index bf422e44..1aa1a3b0 100644 --- a/LEGO1/mxdsobject.h +++ b/LEGO1/mxdsobject.h @@ -34,7 +34,7 @@ class MxDSObject : public MxCore { virtual undefined4 unk14(); // vtable+14; 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 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 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: MxU32 m_sizeOnDisk; // 0x8 diff --git a/LEGO1/mxdsselectaction.cpp b/LEGO1/mxdsselectaction.cpp index ed9b78ba..80477cc7 100644 --- a/LEGO1/mxdsselectaction.cpp +++ b/LEGO1/mxdsselectaction.cpp @@ -86,10 +86,10 @@ MxU32 MxDSSelectAction::GetSizeOnDisk() } // FUNCTION: LEGO1 0x100cbf60 -void MxDSSelectAction::Deserialize(char** p_source, MxS16 p_unk24) +void MxDSSelectAction::Deserialize(char** p_source, MxS16 p_unk0x24) { MxString string; - MxDSAction::Deserialize(p_source, p_unk24); + MxDSAction::Deserialize(p_source, p_unk0x24); MxU32 extraFlag = *(MxU32*) (*p_source + 4) & 1; *p_source += 12; @@ -129,7 +129,7 @@ void MxDSSelectAction::Deserialize(char** p_source, MxS16 p_unk24) MxU32 extraFlag = *(MxU32*) (*p_source + 4) & 1; *p_source += 8; - MxDSAction* action = (MxDSAction*) DeserializeDSObjectDispatch(p_source, p_unk24); + MxDSAction* action = (MxDSAction*) DeserializeDSObjectDispatch(p_source, p_unk0x24); if (index == i) this->m_actions->Append(action); diff --git a/LEGO1/mxdsselectaction.h b/LEGO1/mxdsselectaction.h index 03eacf13..ae18954c 100644 --- a/LEGO1/mxdsselectaction.h +++ b/LEGO1/mxdsselectaction.h @@ -28,9 +28,9 @@ class MxDSSelectAction : public MxDSParallelAction { return !strcmp(p_name, MxDSSelectAction::ClassName()) || MxDSParallelAction::IsA(p_name); } - virtual MxU32 GetSizeOnDisk() override; // vtable+18; - virtual void Deserialize(char** p_source, MxS16 p_unk24) override; // vtable+1c; - virtual MxDSAction* Clone() override; // vtable+2c; + virtual MxU32 GetSizeOnDisk() override; // vtable+18; + virtual void Deserialize(char** p_source, MxS16 p_unk0x24) override; // vtable+1c; + virtual MxDSAction* Clone() override; // vtable+2c; private: MxString m_unk0x9c; diff --git a/LEGO1/mxdssound.cpp b/LEGO1/mxdssound.cpp index 09f5d6d4..1ff2a4d1 100644 --- a/LEGO1/mxdssound.cpp +++ b/LEGO1/mxdssound.cpp @@ -46,9 +46,9 @@ MxDSAction* MxDSSound::Clone() } // 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); } diff --git a/LEGO1/mxdssound.h b/LEGO1/mxdssound.h index bde6a843..0eaa5fce 100644 --- a/LEGO1/mxdssound.h +++ b/LEGO1/mxdssound.h @@ -26,9 +26,9 @@ class MxDSSound : public MxDSMediaAction { return !strcmp(p_name, MxDSSound::ClassName()) || MxDSMediaAction::IsA(p_name); } - virtual MxU32 GetSizeOnDisk() override; // vtable+18; - virtual void Deserialize(char** p_source, MxS16 p_unk24) override; // vtable+1c; - virtual MxDSAction* Clone() override; // vtable+2c; + virtual MxU32 GetSizeOnDisk() override; // vtable+18; + virtual void Deserialize(char** p_source, MxS16 p_unk0x24) override; // vtable+1c; + virtual MxDSAction* Clone() override; // vtable+2c; inline MxS32 GetVolume() const { return m_volume; } diff --git a/LEGO1/mxnextactiondatastart.h b/LEGO1/mxnextactiondatastart.h index c2b5d080..10d2a2f2 100644 --- a/LEGO1/mxnextactiondatastart.h +++ b/LEGO1/mxnextactiondatastart.h @@ -8,10 +8,10 @@ class MxNextActionDataStart : public MxCore { public: // 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_unk0x24val = p_unk24val; + m_unk0x24 = p_unk0x24; m_data = p_data; } @@ -29,11 +29,11 @@ class MxNextActionDataStart : public MxCore { } inline MxU32 GetObjectId() const { return m_objectId; } - inline MxS16 GetUnknown24() const { return m_unk0x24val; } + inline MxS16 GetUnknown24() const { return m_unk0x24; } private: MxU32 m_objectId; - MxS16 m_unk0x24val; + MxS16 m_unk0x24; MxU32 m_data; };