diff --git a/LEGO1/omni/include/mxdsaction.h b/LEGO1/omni/include/mxdsaction.h index 6e3dfc10..1597038e 100644 --- a/LEGO1/omni/include/mxdsaction.h +++ b/LEGO1/omni/include/mxdsaction.h @@ -47,17 +47,17 @@ class MxDSAction : public MxDSObject { return !strcmp(p_name, MxDSAction::ClassName()) || MxDSObject::IsA(p_name); } - undefined4 VTable0x14() override; // vtable+0x14; - MxU32 GetSizeOnDisk() override; // vtable+0x18; - void Deserialize(MxU8*& p_source, MxS16 p_unk0x24) override; // vtable+0x1c; - virtual MxLong GetDuration(); // vtable+0x24; - virtual void SetDuration(MxLong p_duration); // vtable+0x28; - virtual MxDSAction* Clone(); // vtable+0x2c; - virtual void MergeFrom(MxDSAction& p_dsAction); // vtable+0x30; - virtual MxBool HasId(MxU32 p_objectId); // vtable+0x34; - virtual void SetUnknown90(MxLong p_unk0x90); // vtable+0x38; - virtual MxLong GetUnknown90(); // vtable+0x3c; - virtual MxLong GetElapsedTime(); // vtable+0x40; + undefined4 VTable0x14() override; // vtable+0x14 + MxU32 GetSizeOnDisk() override; // vtable+0x18 + void Deserialize(MxU8*& p_source, MxS16 p_unk0x24) override; // vtable+0x1c + virtual MxLong GetDuration(); // vtable+0x24 + virtual void SetDuration(MxLong p_duration); // vtable+0x28 + virtual MxDSAction* Clone(); // vtable+0x2c + virtual void MergeFrom(MxDSAction& p_dsAction); // vtable+0x30 + virtual MxBool HasId(MxU32 p_objectId); // vtable+0x34 + virtual void SetUnknown90(MxLong p_unk0x90); // vtable+0x38 + virtual MxLong GetUnknown90(); // vtable+0x3c + virtual MxLong GetElapsedTime(); // vtable+0x40 void AppendExtra(MxU16 p_extraLength, const char* p_extraData); diff --git a/LEGO1/omni/include/mxdsanim.h b/LEGO1/omni/include/mxdsanim.h index ddcdbd54..817e3c5b 100644 --- a/LEGO1/omni/include/mxdsanim.h +++ b/LEGO1/omni/include/mxdsanim.h @@ -30,7 +30,7 @@ class MxDSAnim : public MxDSMediaAction { return !strcmp(p_name, MxDSAnim::ClassName()) || MxDSMediaAction::IsA(p_name); } - MxDSAction* Clone() override; // vtable+0x2c; + MxDSAction* Clone() override; // vtable+0x2c // SYNTHETIC: LEGO1 0x100c9180 // SYNTHETIC: BETA10 0x1015d910 diff --git a/LEGO1/omni/include/mxdsevent.h b/LEGO1/omni/include/mxdsevent.h index ac84ec74..14e42ad7 100644 --- a/LEGO1/omni/include/mxdsevent.h +++ b/LEGO1/omni/include/mxdsevent.h @@ -29,7 +29,7 @@ class MxDSEvent : public MxDSMediaAction { return !strcmp(p_name, MxDSEvent::ClassName()) || MxDSMediaAction::IsA(p_name); } - MxDSAction* Clone() override; // vtable+0x2c; + MxDSAction* Clone() override; // vtable+0x2c // SYNTHETIC: LEGO1 0x100c9780 // SYNTHETIC: BETA10 0x1015da90 diff --git a/LEGO1/omni/include/mxdsmediaaction.h b/LEGO1/omni/include/mxdsmediaaction.h index b93d3eb4..359061ca 100644 --- a/LEGO1/omni/include/mxdsmediaaction.h +++ b/LEGO1/omni/include/mxdsmediaaction.h @@ -35,10 +35,10 @@ class MxDSMediaAction : public MxDSAction { // SYNTHETIC: BETA10 0x1015d810 // MxDSMediaAction::`scalar deleting destructor' - undefined4 VTable0x14() override; // vtable+0x14; - MxU32 GetSizeOnDisk() override; // vtable+0x18; - void Deserialize(MxU8*& p_source, MxS16 p_unk0x24) override; // vtable+0x1c; - MxDSAction* Clone() override; // vtable+0x2c; + undefined4 VTable0x14() override; // vtable+0x14 + MxU32 GetSizeOnDisk() override; // vtable+0x18 + void Deserialize(MxU8*& p_source, MxS16 p_unk0x24) override; // vtable+0x1c + MxDSAction* Clone() override; // vtable+0x2c void CopyMediaSrcPath(const char* p_mediaSrcPath); diff --git a/LEGO1/omni/include/mxdsmultiaction.h b/LEGO1/omni/include/mxdsmultiaction.h index 6f3c4647..90cc5192 100644 --- a/LEGO1/omni/include/mxdsmultiaction.h +++ b/LEGO1/omni/include/mxdsmultiaction.h @@ -31,14 +31,14 @@ class MxDSMultiAction : public MxDSAction { return !strcmp(p_name, MxDSMultiAction::ClassName()) || MxDSAction::IsA(p_name); } - undefined4 VTable0x14() override; // vtable+0x14; - MxU32 GetSizeOnDisk() override; // vtable+0x18; - void Deserialize(MxU8*& p_source, MxS16 p_unk0x24) override; // vtable+0x1c; - void SetAtomId(MxAtomId p_atomId) override; // vtable+0x20; - MxDSAction* Clone() override; // vtable+0x2c; - void MergeFrom(MxDSAction& p_dsAction) override; // vtable+0x30; - MxBool HasId(MxU32 p_objectId) override; // vtable+0x34; - void SetUnknown90(MxLong p_unk0x90) override; // vtable+0x38; + undefined4 VTable0x14() override; // vtable+0x14 + MxU32 GetSizeOnDisk() override; // vtable+0x18 + void Deserialize(MxU8*& p_source, MxS16 p_unk0x24) override; // vtable+0x1c + void SetAtomId(MxAtomId p_atomId) override; // vtable+0x20 + MxDSAction* Clone() override; // vtable+0x2c + void MergeFrom(MxDSAction& p_dsAction) override; // vtable+0x30 + MxBool HasId(MxU32 p_objectId) override; // vtable+0x34 + void SetUnknown90(MxLong p_unk0x90) override; // vtable+0x38 // FUNCTION: BETA10 0x1004e180 MxDSActionList* GetActionList() const { return m_actionList; } diff --git a/LEGO1/omni/include/mxdsobject.h b/LEGO1/omni/include/mxdsobject.h index cb25bd9d..5f60bfee 100644 --- a/LEGO1/omni/include/mxdsobject.h +++ b/LEGO1/omni/include/mxdsobject.h @@ -62,16 +62,16 @@ class MxDSObject : public MxCore { MxBool IsA(const char* p_name) const override { return !strcmp(p_name, MxDSObject::ClassName()) || MxCore::IsA(p_name); - } // vtable+0x10; + } // vtable+0x10 - virtual undefined4 VTable0x14(); // vtable+0x14; - virtual MxU32 GetSizeOnDisk(); // vtable+0x18; - virtual void Deserialize(MxU8*& p_source, MxS16 p_unk0x24); // vtable+0x1c; + virtual undefined4 VTable0x14(); // vtable+0x14 + virtual MxU32 GetSizeOnDisk(); // vtable+0x18 + virtual void Deserialize(MxU8*& p_source, MxS16 p_unk0x24); // vtable+0x1c // FUNCTION: ISLE 0x401c40 // FUNCTION: LEGO1 0x10005530 // FUNCTION: BETA10 0x100152e0 - virtual void SetAtomId(MxAtomId p_atomId) { m_atomId = p_atomId; } // vtable+0x20; + virtual void SetAtomId(MxAtomId p_atomId) { m_atomId = p_atomId; } // vtable+0x20 // FUNCTION: BETA10 0x1012ef90 Type GetType() const { return (Type) m_type; } diff --git a/LEGO1/omni/include/mxdsobjectaction.h b/LEGO1/omni/include/mxdsobjectaction.h index ea63a19b..0482139a 100644 --- a/LEGO1/omni/include/mxdsobjectaction.h +++ b/LEGO1/omni/include/mxdsobjectaction.h @@ -29,8 +29,8 @@ class MxDSObjectAction : public MxDSMediaAction { return !strcmp(p_name, MxDSObjectAction::ClassName()) || MxDSMediaAction::IsA(p_name); } - MxDSAction* Clone() override; // vtable+0x2c; - virtual void CopyFrom(MxDSObjectAction& p_dsObjectAction); // vtable+0x44; + MxDSAction* Clone() override; // vtable+0x2c + virtual void CopyFrom(MxDSObjectAction& p_dsObjectAction); // vtable+0x44 // SYNTHETIC: LEGO1 0x100c8a00 // SYNTHETIC: BETA10 0x1015c720 diff --git a/LEGO1/omni/include/mxdsparallelaction.h b/LEGO1/omni/include/mxdsparallelaction.h index 19dd2761..76e9fd44 100644 --- a/LEGO1/omni/include/mxdsparallelaction.h +++ b/LEGO1/omni/include/mxdsparallelaction.h @@ -30,13 +30,13 @@ class MxDSParallelAction : public MxDSMultiAction { return !strcmp(p_name, MxDSParallelAction::ClassName()) || MxDSMultiAction::IsA(p_name); } - MxLong GetDuration() override; // vtable+0x24; + MxLong GetDuration() override; // vtable+0x24 // FUNCTION: LEGO1 0x100caef0 // FUNCTION: BETA10 0x1015b370 void SetDuration(MxLong p_duration) override { m_duration = p_duration; } // vtable+0x28 - MxDSAction* Clone() override; // vtable+0x2c; + MxDSAction* Clone() override; // vtable+0x2c // SYNTHETIC: LEGO1 0x100cb020 // SYNTHETIC: BETA10 0x1015b420 diff --git a/LEGO1/omni/include/mxdsselectaction.h b/LEGO1/omni/include/mxdsselectaction.h index 1b9650d7..ed3bca56 100644 --- a/LEGO1/omni/include/mxdsselectaction.h +++ b/LEGO1/omni/include/mxdsselectaction.h @@ -32,9 +32,9 @@ class MxDSSelectAction : public MxDSParallelAction { return !strcmp(p_name, MxDSSelectAction::ClassName()) || MxDSParallelAction::IsA(p_name); } - MxU32 GetSizeOnDisk() override; // vtable+0x18; - void Deserialize(MxU8*& p_source, MxS16 p_unk0x24) override; // vtable+0x1c; - MxDSAction* Clone() override; // vtable+0x2c; + MxU32 GetSizeOnDisk() override; // vtable+0x18 + void Deserialize(MxU8*& p_source, MxS16 p_unk0x24) override; // vtable+0x1c + MxDSAction* Clone() override; // vtable+0x2c // SYNTHETIC: LEGO1 0x100cb840 // SYNTHETIC: BETA10 0x1015b4e0 diff --git a/LEGO1/omni/include/mxdsserialaction.h b/LEGO1/omni/include/mxdsserialaction.h index a3f8d622..5e8a4fbd 100644 --- a/LEGO1/omni/include/mxdsserialaction.h +++ b/LEGO1/omni/include/mxdsserialaction.h @@ -31,9 +31,9 @@ class MxDSSerialAction : public MxDSMultiAction { return !strcmp(p_name, MxDSSerialAction::ClassName()) || MxDSMultiAction::IsA(p_name); } - MxLong GetDuration() override; // vtable+0x24; - void SetDuration(MxLong p_duration) override; // vtable+0x28; - MxDSAction* Clone() override; // vtable+0x2c; + MxLong GetDuration() override; // vtable+0x24 + void SetDuration(MxLong p_duration) override; // vtable+0x28 + MxDSAction* Clone() override; // vtable+0x2c // SYNTHETIC: LEGO1 0x100cabf0 // SYNTHETIC: BETA10 0x1015b330 diff --git a/LEGO1/omni/include/mxdssound.h b/LEGO1/omni/include/mxdssound.h index e4c967c1..8a5457cd 100644 --- a/LEGO1/omni/include/mxdssound.h +++ b/LEGO1/omni/include/mxdssound.h @@ -30,9 +30,9 @@ class MxDSSound : public MxDSMediaAction { return !strcmp(p_name, MxDSSound::ClassName()) || MxDSMediaAction::IsA(p_name); } - MxU32 GetSizeOnDisk() override; // vtable+0x18; - void Deserialize(MxU8*& p_source, MxS16 p_unk0x24) override; // vtable+0x1c; - MxDSAction* Clone() override; // vtable+0x2c; + MxU32 GetSizeOnDisk() override; // vtable+0x18 + void Deserialize(MxU8*& p_source, MxS16 p_unk0x24) override; // vtable+0x1c + MxDSAction* Clone() override; // vtable+0x2c // FUNCTION: BETA10 0x1008d060 MxS32 GetVolume() const { return m_volume; } diff --git a/LEGO1/omni/include/mxdsstill.h b/LEGO1/omni/include/mxdsstill.h index 3c736abd..b937a7cf 100644 --- a/LEGO1/omni/include/mxdsstill.h +++ b/LEGO1/omni/include/mxdsstill.h @@ -30,7 +30,7 @@ class MxDSStill : public MxDSMediaAction { return !strcmp(p_name, MxDSStill::ClassName()) || MxDSMediaAction::IsA(p_name); } - MxDSAction* Clone() override; // vtable+0x2c; + MxDSAction* Clone() override; // vtable+0x2c // SYNTHETIC: LEGO1 0x100c9a50 // SYNTHETIC: BETA10 0x1015db50 diff --git a/LEGO1/omni/include/mxdsstreamingaction.h b/LEGO1/omni/include/mxdsstreamingaction.h index 96be50e5..22ccd62d 100644 --- a/LEGO1/omni/include/mxdsstreamingaction.h +++ b/LEGO1/omni/include/mxdsstreamingaction.h @@ -16,7 +16,7 @@ class MxDSStreamingAction : public MxDSAction { MxDSStreamingAction* CopyFrom(MxDSStreamingAction& p_dsStreamingAction); - MxBool HasId(MxU32 p_objectId) override; // vtable+0x34; + MxBool HasId(MxU32 p_objectId) override; // vtable+0x34 void Init(); void SetInternalAction(MxDSAction* p_dsAction);