Refactor MxDSType

LEGO1/omni/include/mxdsobject.h

@@ -4,7 +4,6 @@
 #include "decomp.h"
 #include "mxatomid.h"
 #include "mxcore.h"
-#include "mxdstypes.h"
 
 class MxPresenter;
 
@@ -12,6 +11,21 @@ class MxPresenter;
 // SIZE 0x2c
 class MxDSObject : public MxCore {
 public:
+	enum MxDSType {
+		e_object = 0,
+		e_action,
+		e_mediaAction,
+		e_anim,
+		e_sound,
+		e_multiAction,
+		e_serialAction,
+		e_parallelAction,
+		e_event,
+		e_selectAction,
+		e_still,
+		e_objectAction,
+	};
+
 	MxDSObject();
 	virtual ~MxDSObject() override;
 

LEGO1/omni/include/mxdstypes.h

@@ -1,19 +0,0 @@
-#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

LEGO1/omni/src/action/mxdsaction.cpp

@@ -22,7 +22,7 @@ MxDSAction::MxDSAction()
 	this->m_duration = INT_MIN;
 	this->m_loopCount = -1;
 
-	this->SetType(MxDSType_Action);
+	this->SetType(e_action);
 	this->m_location.Fill(FLT_MAX);
 	this->m_direction.Fill(FLT_MAX);
 	this->m_up.Fill(FLT_MAX);

LEGO1/omni/src/action/mxdsanim.cpp

@@ -5,7 +5,7 @@ DECOMP_SIZE_ASSERT(MxDSAnim, 0xb8)
 // FUNCTION: LEGO1 0x100c8ff0
 MxDSAnim::MxDSAnim()
 {
-	this->SetType(MxDSType_Anim);
+	this->SetType(e_anim);
 }
 
 // FUNCTION: LEGO1 0x100c91a0

LEGO1/omni/src/action/mxdsevent.cpp

@@ -5,7 +5,7 @@ DECOMP_SIZE_ASSERT(MxDSEvent, 0xb8)
 // FUNCTION: LEGO1 0x100c95f0
 MxDSEvent::MxDSEvent()
 {
-	this->SetType(MxDSType_Event);
+	this->SetType(e_event);
 }
 
 // FUNCTION: LEGO1 0x100c97a0

LEGO1/omni/src/action/mxdsmediaaction.cpp

@@ -15,7 +15,7 @@ MxDSMediaAction::MxDSMediaAction()
 	this->m_paletteManagement = 1;
 	this->m_unk0xb4 = -1;
 	this->m_sustainTime = 0;
-	this->SetType(MxDSType_MediaAction);
+	this->SetType(e_mediaAction);
 }
 
 // FUNCTION: LEGO1 0x100c8cf0

LEGO1/omni/src/action/mxdsmultiaction.cpp

@@ -7,7 +7,7 @@ DECOMP_SIZE_ASSERT(MxDSActionListCursor, 0x10);
 // FUNCTION: LEGO1 0x100c9b90
 MxDSMultiAction::MxDSMultiAction()
 {
-	this->SetType(MxDSType_MultiAction);
+	this->SetType(e_multiAction);
 	this->m_actions = new MxDSActionList;
 	this->m_actions->SetDestroy(MxDSActionList::Destroy);
 }

LEGO1/omni/src/action/mxdsobject.cpp

@@ -11,7 +11,6 @@
 #include "mxdsserialaction.h"
 #include "mxdssound.h"
 #include "mxdsstill.h"
-#include "mxdstypes.h"
 #include "mxutil.h"
 
 #include <stdlib.h>
@@ -22,7 +21,7 @@ DECOMP_SIZE_ASSERT(MxDSObject, 0x2c);
 // FUNCTION: LEGO1 0x100bf6a0
 MxDSObject::MxDSObject()
 {
-	this->SetType(MxDSType_Object);
+	this->SetType(e_object);
 	this->m_sourceName = NULL;
 	this->m_unk0x14 = 0;
 	this->m_objectName = NULL;
@@ -148,40 +147,40 @@ MxDSObject* DeserializeDSObjectDispatch(MxU8** p_source, MxS16 p_flags)
 	switch (type) {
 	default:
 		return NULL;
-	case MxDSType_Object:
+	case MxDSObject::e_object:
 		obj = new MxDSObject();
 		break;
-	case MxDSType_Action:
+	case MxDSObject::e_action:
 		obj = new MxDSAction();
 		break;
-	case MxDSType_MediaAction:
+	case MxDSObject::e_mediaAction:
 		obj = new MxDSMediaAction();
 		break;
-	case MxDSType_Anim:
+	case MxDSObject::e_anim:
 		obj = new MxDSAnim();
 		break;
-	case MxDSType_Sound:
+	case MxDSObject::e_sound:
 		obj = new MxDSSound();
 		break;
-	case MxDSType_MultiAction:
+	case MxDSObject::e_multiAction:
 		obj = new MxDSMultiAction();
 		break;
-	case MxDSType_SerialAction:
+	case MxDSObject::e_serialAction:
 		obj = new MxDSSerialAction();
 		break;
-	case MxDSType_ParallelAction:
+	case MxDSObject::e_parallelAction:
 		obj = new MxDSParallelAction();
 		break;
-	case MxDSType_Event:
+	case MxDSObject::e_event:
 		obj = new MxDSEvent();
 		break;
-	case MxDSType_SelectAction:
+	case MxDSObject::e_selectAction:
 		obj = new MxDSSelectAction();
 		break;
-	case MxDSType_Still:
+	case MxDSObject::e_still:
 		obj = new MxDSStill();
 		break;
-	case MxDSType_ObjectAction:
+	case MxDSObject::e_objectAction:
 		obj = new MxDSObjectAction();
 		break;
 	}

LEGO1/omni/src/action/mxdsobjectaction.cpp

@@ -5,7 +5,7 @@ DECOMP_SIZE_ASSERT(MxDSObjectAction, 0xb8)
 // FUNCTION: LEGO1 0x100c8870
 MxDSObjectAction::MxDSObjectAction()
 {
-	this->SetType(MxDSType_ObjectAction);
+	this->SetType(e_objectAction);
 }
 
 // FUNCTION: LEGO1 0x100c8a20

LEGO1/omni/src/action/mxdsparallelaction.cpp

@@ -7,7 +7,7 @@ DECOMP_SIZE_ASSERT(MxDSParallelAction, 0x9c)
 // FUNCTION: LEGO1 0x100cae80
 MxDSParallelAction::MxDSParallelAction()
 {
-	this->SetType(MxDSType_ParallelAction);
+	this->SetType(e_parallelAction);
 }
 
 // FUNCTION: LEGO1 0x100cb040

LEGO1/omni/src/action/mxdsselectaction.cpp

@@ -12,7 +12,7 @@ DECOMP_SIZE_ASSERT(MxListEntry<MxString>, 0x18)
 // FUNCTION: LEGO1 0x100cb2b0
 MxDSSelectAction::MxDSSelectAction()
 {
-	this->SetType(MxDSType_SelectAction);
+	this->SetType(e_selectAction);
 	this->m_unk0xac = new MxStringList;
 }
 

LEGO1/omni/src/action/mxdsserialaction.cpp

@@ -7,7 +7,7 @@ DECOMP_SIZE_ASSERT(MxDSSerialAction, 0xa8)
 // FUNCTION: LEGO1 0x100ca9d0
 MxDSSerialAction::MxDSSerialAction()
 {
-	this->SetType(MxDSType_SerialAction);
+	this->SetType(e_serialAction);
 	this->m_cursor = new MxDSActionListCursor(this->m_actions);
 	this->m_unk0xa0 = 0;
 }

LEGO1/omni/src/action/mxdssound.cpp

@@ -8,7 +8,7 @@ DECOMP_SIZE_ASSERT(MxDSSound, 0xc0)
 MxDSSound::MxDSSound()
 {
 	this->m_volume = 0x4f;
-	this->SetType(MxDSType_Sound);
+	this->SetType(e_sound);
 }
 
 // FUNCTION: LEGO1 0x100c9470

LEGO1/omni/src/action/mxdsstill.cpp

@@ -5,7 +5,7 @@ DECOMP_SIZE_ASSERT(MxDSStill, 0xb8)
 // FUNCTION: LEGO1 0x100c98c0
 MxDSStill::MxDSStill()
 {
-	this->SetType(MxDSType_Still);
+	this->SetType(e_still);
 }
 
 // FUNCTION: LEGO1 0x100c9a70

LEGO1/omni/src/common/mxpresenter.cpp

@@ -185,7 +185,7 @@ const char* PresenterNameDispatch(const MxDSAction& p_action)
 
 	if (!name || strlen(name) == 0) {
 		switch (p_action.GetType()) {
-		case MxDSType_Anim:
+		case MxDSObject::e_anim:
 			format = ((MxDSAnim&) p_action).GetMediaFormat();
 			switch (format) {
 			case FOURCC(' ', 'F', 'L', 'C'):
@@ -197,7 +197,7 @@ const char* PresenterNameDispatch(const MxDSAction& p_action)
 			}
 			break;
 
-		case MxDSType_Sound:
+		case MxDSObject::e_sound:
 			format = ((MxDSSound&) p_action).GetMediaFormat();
 			switch (format) {
 			case FOURCC(' ', 'M', 'I', 'D'):
@@ -209,17 +209,17 @@ const char* PresenterNameDispatch(const MxDSAction& p_action)
 			}
 			break;
 
-		case MxDSType_SerialAction:
+		case MxDSObject::e_serialAction:
-		case MxDSType_ParallelAction:
+		case MxDSObject::e_parallelAction:
-		case MxDSType_SelectAction:
+		case MxDSObject::e_selectAction:
 			name = "MxCompositePresenter";
 			break;
 
-		case MxDSType_Event:
+		case MxDSObject::e_event:
 			name = "MxEventPresenter";
 			break;
 
-		case MxDSType_Still:
+		case MxDSObject::e_still:
 			name = "MxStillPresenter";
 			break;
 		}