diff --git a/LEGO1/mxatomid.h b/LEGO1/mxatomid.h index 6b7dddbb..4a2082cf 100644 --- a/LEGO1/mxatomid.h +++ b/LEGO1/mxatomid.h @@ -5,10 +5,10 @@ enum LookupMode { - LookupMode_Exact = 0, - LookupMode_LowerCase = 1, - LookupMode_UpperCase = 2, - LookupMode_LowerCase2 = 3 + LookupMode_Exact = 0, + LookupMode_LowerCase = 1, + LookupMode_UpperCase = 2, + LookupMode_LowerCase2 = 3 }; class MxAtomId diff --git a/LEGO1/mxdsaction.cpp b/LEGO1/mxdsaction.cpp index a193ab21..e5162f89 100644 --- a/LEGO1/mxdsaction.cpp +++ b/LEGO1/mxdsaction.cpp @@ -4,9 +4,10 @@ MxDSAction::MxDSAction() { // TODO + this->SetType(MxDSType_Action); } -// OFFSET: LEGO1 0x100ada80 +// OFFSET: LEGO1 0x100ada80 STUB MxDSAction::~MxDSAction() { // TODO diff --git a/LEGO1/mxdsanim.cpp b/LEGO1/mxdsanim.cpp index 9a56d359..b9b887cd 100644 --- a/LEGO1/mxdsanim.cpp +++ b/LEGO1/mxdsanim.cpp @@ -3,11 +3,10 @@ // OFFSET: LEGO1 0x100c8ff0 MxDSAnim::MxDSAnim() { - // TODO + this->SetType(MxDSType_Anim); } // OFFSET: LEGO1 0x100c91a0 MxDSAnim::~MxDSAnim() { - // TODO } diff --git a/LEGO1/mxdsevent.cpp b/LEGO1/mxdsevent.cpp index a45ec93a..b6571075 100644 --- a/LEGO1/mxdsevent.cpp +++ b/LEGO1/mxdsevent.cpp @@ -1,13 +1,12 @@ #include "mxdsevent.h" -// OFFSET: LEGO1 0x100c95f0 STUB +// OFFSET: LEGO1 0x100c95f0 MxDSEvent::MxDSEvent() { - // TODO + this->SetType(MxDSType_Event); } -// OFFSET: LEGO1 0x100c97a0 STUB +// OFFSET: LEGO1 0x100c97a0 MxDSEvent::~MxDSEvent() { - // TODO } diff --git a/LEGO1/mxdsmediaaction.cpp b/LEGO1/mxdsmediaaction.cpp index 9587b152..5f9c1132 100644 --- a/LEGO1/mxdsmediaaction.cpp +++ b/LEGO1/mxdsmediaaction.cpp @@ -4,9 +4,10 @@ MxDSMediaAction::MxDSMediaAction() { // TODO + this->SetType(MxDSType_MediaAction); } -// OFFSET: LEGO1 0x100c8cf0 +// OFFSET: LEGO1 0x100c8cf0 STUB MxDSMediaAction::~MxDSMediaAction() { // TODO diff --git a/LEGO1/mxdsmultiaction.cpp b/LEGO1/mxdsmultiaction.cpp index 4b36f2ec..4188fb66 100644 --- a/LEGO1/mxdsmultiaction.cpp +++ b/LEGO1/mxdsmultiaction.cpp @@ -3,11 +3,12 @@ // OFFSET: LEGO1 0x100c9b90 MxDSMultiAction::MxDSMultiAction() { - + // TODO + this->SetType(MxDSType_MultiAction); } -// OFFSET: LEGO1 0x100ca060 +// OFFSET: LEGO1 0x100ca060 STUB MxDSMultiAction::~MxDSMultiAction() { - + // TODO } diff --git a/LEGO1/mxdsobject.cpp b/LEGO1/mxdsobject.cpp index abe8902f..f3f70edf 100644 --- a/LEGO1/mxdsobject.cpp +++ b/LEGO1/mxdsobject.cpp @@ -6,7 +6,7 @@ // OFFSET: LEGO1 0x100bf6a0 MxDSObject::MxDSObject() { - this->m_unk0c = 0; + this->SetType(MxDSType_Object); this->m_sourceName = NULL; this->m_unk14 = 0; this->m_objectName = NULL; diff --git a/LEGO1/mxdsobject.h b/LEGO1/mxdsobject.h index ff7d4a02..12dac6ba 100644 --- a/LEGO1/mxdsobject.h +++ b/LEGO1/mxdsobject.h @@ -3,6 +3,7 @@ #include "mxcore.h" #include "mxatomid.h" +#include "mxdstypes.h" // VTABLE 0x100dc868 // SIZE 0x2c @@ -39,9 +40,11 @@ class MxDSObject : public MxCore // OFFSET: LEGO1 0x10005530 inline void SetAtomId(MxAtomId p_atomId) { this->m_atomId = p_atomId; } + inline void SetType(MxDSType p_type) { this->m_type = p_type; } + private: unsigned int m_unk08; - MxS16 m_unk0c; + MxS16 m_type; char* m_sourceName; int m_unk14; char *m_objectName; diff --git a/LEGO1/mxdsobjectaction.cpp b/LEGO1/mxdsobjectaction.cpp index 990168da..d468f30a 100644 --- a/LEGO1/mxdsobjectaction.cpp +++ b/LEGO1/mxdsobjectaction.cpp @@ -3,11 +3,10 @@ // OFFSET: LEGO1 0x100c8870 MxDSObjectAction::MxDSObjectAction() { - // TODO + this->SetType(MxDSType_ObjectAction); } // OFFSET: LEGO1 0x100c8a20 MxDSObjectAction::~MxDSObjectAction() { - // TODO } diff --git a/LEGO1/mxdsparallelaction.cpp b/LEGO1/mxdsparallelaction.cpp index 78b9623a..97a8a9d3 100644 --- a/LEGO1/mxdsparallelaction.cpp +++ b/LEGO1/mxdsparallelaction.cpp @@ -3,11 +3,10 @@ // OFFSET: LEGO1 0x100cae80 MxDSParallelAction::MxDSParallelAction() { - + this->SetType(MxDSType_ParallelAction); } // OFFSET: LEGO1 0x100cb040 MxDSParallelAction::~MxDSParallelAction() { - } diff --git a/LEGO1/mxdsselectaction.cpp b/LEGO1/mxdsselectaction.cpp index 575aba29..5cae82fb 100644 --- a/LEGO1/mxdsselectaction.cpp +++ b/LEGO1/mxdsselectaction.cpp @@ -3,11 +3,12 @@ // OFFSET: LEGO1 0x100cb2b0 MxDSSelectAction::MxDSSelectAction() { - + // TODO + this->SetType(MxDSType_SelectAction); } -// OFFSET: LEGO1 0x100cb8d0 +// OFFSET: LEGO1 0x100cb8d0 STUB MxDSSelectAction::~MxDSSelectAction() { - + // TODO } diff --git a/LEGO1/mxdsserialaction.cpp b/LEGO1/mxdsserialaction.cpp index a5e8f623..46964208 100644 --- a/LEGO1/mxdsserialaction.cpp +++ b/LEGO1/mxdsserialaction.cpp @@ -3,11 +3,12 @@ // OFFSET: LEGO1 0x100ca9d0 MxDSSerialAction::MxDSSerialAction() { - + // TODO + this->SetType(MxDSType_SerialAction); } -// OFFSET: LEGO1 0x100cac10 +// OFFSET: LEGO1 0x100cac10 STUB MxDSSerialAction::~MxDSSerialAction() { - + // TODO } diff --git a/LEGO1/mxdssound.cpp b/LEGO1/mxdssound.cpp index 4f2b0d61..30894abc 100644 --- a/LEGO1/mxdssound.cpp +++ b/LEGO1/mxdssound.cpp @@ -4,10 +4,10 @@ MxDSSound::MxDSSound() { // TODO + this->SetType(MxDSType_Sound); } // OFFSET: LEGO1 0x100c9470 MxDSSound::~MxDSSound() { - // TODO } diff --git a/LEGO1/mxdsstill.cpp b/LEGO1/mxdsstill.cpp index 0a5434f1..938afe83 100644 --- a/LEGO1/mxdsstill.cpp +++ b/LEGO1/mxdsstill.cpp @@ -3,11 +3,10 @@ // OFFSET: LEGO1 0x100c98c0 MxDSStill::MxDSStill() { - // TODO + this->SetType(MxDSType_Still); } // OFFSET: LEGO1 0x100c9a70 MxDSStill::~MxDSStill() { - // TODO } diff --git a/LEGO1/mxdstypes.h b/LEGO1/mxdstypes.h new file mode 100755 index 00000000..6487bad5 --- /dev/null +++ b/LEGO1/mxdstypes.h @@ -0,0 +1,20 @@ +#ifndef MXDSTYPES_H +#define MXDSTYPES_H + +enum MxDSType +{ + MxDSType_Object = 0, + MxDSType_Action = 1, + MxDSType_MediaAction = 2, + MxDSType_Anim = 3, + MxDSType_Sound = 4, + MxDSType_MultiAction = 5, + MxDSType_SerialAction = 6, + MxDSType_ParallelAction = 7, + MxDSType_Event = 8, + MxDSType_SelectAction = 9, + MxDSType_Still = 10, + MxDSType_ObjectAction = 11, +}; + +#endif // MXDSTYPES_H