Merge branch 'development' into ModuleMan

Author: Causeless

Resources/Credits.h

@@ -1,5 +1,4 @@
-#ifndef _RTECREDITS_
-#define _RTECREDITS_
+#pragma once
 
 // DO NOT INDENT!
 // String literals are kinda trash and any whitespace/indentation will be part of the string.
@@ -142,5 +141,3 @@ FMOD Studio by Firelight Technologies Pty Ltd.
 
 
 Cortex Command is TM and © 2023 Data Realms, LLC)";
-
-#endif

Source/Activities/ActorEditor.cpp

@@ -23,6 +23,14 @@ namespace RTE {
 
 	ConcreteClassInfo(ActorEditor, EditorActivity, 0);
 
+	ActorEditor::ActorEditor() {
+		Clear();
+	}
+
+	ActorEditor::~ActorEditor() {
+		Destroy(true);
+	}
+
 	void ActorEditor::Clear() {
 		m_pEditedActor = 0;
 		m_pPicker = 0;
@@ -167,9 +175,9 @@ namespace RTE {
 			PieMenu* editedActorPieMenu = m_pEditedActor->GetPieMenu();
 			editedActorPieMenu->SetEnabled(m_PlayerController[0].IsState(ControlState::PIE_MENU_ACTIVE) && m_EditorMode != EditorActivity::LOADDIALOG);
 
-			if (editedActorPieMenu->GetPieCommand() == PieSlice::SliceType::EditorLoad) {
+			if (editedActorPieMenu->GetPieCommand() == PieSliceType::EditorLoad) {
 				ReloadActorData();
-			} else if (editedActorPieMenu->GetPieCommand() == PieSlice::SliceType::EditorPick) {
+			} else if (editedActorPieMenu->GetPieCommand() == PieSliceType::EditorPick) {
 				m_EditorMode = EditorActivity::LOADDIALOG;
 				m_ModeChange = true;
 			}

Source/Activities/ActorEditor.h

@@ -1,5 +1,4 @@
-#ifndef _RTEACTOREDITOR_
-#define _RTEACTOREDITOR_
+#pragma once
 
 /// Header file for the ActorEditor class.
 /// @author Daniel Tabar
@@ -37,11 +36,11 @@ namespace RTE {
 
 		/// Constructor method used to instantiate a ActorEditor object in system
 		/// memory. Create() should be called before using the object.
-		ActorEditor() { Clear(); }
+		ActorEditor();
 
 		/// Destructor method used to clean up a ActorEditor object before deletion
 		/// from system memory.
-		~ActorEditor() override { Destroy(true); }
+		~ActorEditor() override;
 
 		/// Makes the ActorEditor object ready for use.
 		/// @return An error return value signaling sucess or any particular failure.
@@ -129,5 +128,3 @@ namespace RTE {
 	};
 
 } // namespace RTE
-
-#endif // File

Source/Activities/AreaEditor.cpp

@@ -30,6 +30,14 @@ namespace RTE {
 
 	ConcreteClassInfo(AreaEditor, EditorActivity, 0);
 
+	AreaEditor::AreaEditor() {
+		Clear();
+	}
+
+	AreaEditor::~AreaEditor() {
+		Destroy(true);
+	}
+
 	void AreaEditor::Clear() {
 		m_pEditorGUI = 0;
 		m_pNewAreaName = 0;
@@ -211,24 +219,24 @@ namespace RTE {
 		m_NeedSave = m_pEditorGUI->EditMade() || m_NeedSave;
 
 		// Get any mode change commands that the user gave the Editor GUI
-		if (m_pEditorGUI->GetActivatedPieSlice() == PieSlice::SliceType::EditorNew && m_EditorMode != NEWDIALOG) {
+		if (m_pEditorGUI->GetActivatedPieSlice() == PieSliceType::EditorNew && m_EditorMode != NEWDIALOG) {
 			m_pEditorGUI->SetEditorGUIMode(AreaEditorGUI::INACTIVE);
 			m_EditorMode = EditorActivity::NEWDIALOG;
 			m_ModeChange = true;
 			// This is ahack so we don't get a 'save changes dialog' when we jsut want to create a new area.
 			// Will turn on dirtyness immediately as New button is pressed below
 			m_NeedSave = false;
-		} else if (m_pEditorGUI->GetActivatedPieSlice() == PieSlice::SliceType::EditorLoad && m_EditorMode != LOADDIALOG) {
+		} else if (m_pEditorGUI->GetActivatedPieSlice() == PieSliceType::EditorLoad && m_EditorMode != LOADDIALOG) {
 			m_pEditorGUI->SetEditorGUIMode(AreaEditorGUI::INACTIVE);
 			m_EditorMode = EditorActivity::LOADDIALOG;
 			m_ModeChange = true;
-		} else if (m_pEditorGUI->GetActivatedPieSlice() == PieSlice::SliceType::EditorSave && m_EditorMode != SAVEDIALOG) {
+		} else if (m_pEditorGUI->GetActivatedPieSlice() == PieSliceType::EditorSave && m_EditorMode != SAVEDIALOG) {
 			m_pEditorGUI->SetEditorGUIMode(AreaEditorGUI::INACTIVE);
 			m_EditorMode = EditorActivity::SAVEDIALOG;
 			m_ModeChange = true;
 		}
 		// Test the scene by starting a Skirmish Defense with it, after saving
-		else if (m_pEditorGUI->GetActivatedPieSlice() == PieSlice::SliceType::EditorDone || m_EditorMode == TESTINGOBJECT) {
+		else if (m_pEditorGUI->GetActivatedPieSlice() == PieSliceType::EditorDone || m_EditorMode == TESTINGOBJECT) {
 			m_pEditorGUI->SetEditorGUIMode(AreaEditorGUI::INACTIVE);
 
 			if (m_NeedSave) {

Source/Activities/AreaEditor.h

@@ -1,5 +1,4 @@
-#ifndef _RTEAREAEDITOR_
-#define _RTEAREAEDITOR_
+#pragma once
 
 /// Header file for the AreaEditor class.
 /// @author Daniel Tabar
@@ -35,11 +34,11 @@ namespace RTE {
 
 		/// Constructor method used to instantiate a AreaEditor object in system
 		/// memory. Create() should be called before using the object.
-		AreaEditor() { Clear(); }
+		AreaEditor();
 
 		/// Destructor method used to clean up a AreaEditor object before deletion
 		/// from system memory.
-		~AreaEditor() override { Destroy(true); }
+		~AreaEditor() override;
 
 		/// Makes the AreaEditor object ready for use.
 		/// @return An error return value signaling sucess or any particular failure.
@@ -142,5 +141,3 @@ namespace RTE {
 	};
 
 } // namespace RTE
-
-#endif // File

Source/Activities/AssemblyEditor.cpp

@@ -30,6 +30,14 @@ namespace RTE {
 
 	ConcreteClassInfo(AssemblyEditor, EditorActivity, 0);
 
+	AssemblyEditor::AssemblyEditor() {
+		Clear();
+	}
+
+	AssemblyEditor::~AssemblyEditor() {
+		Destroy(true);
+	}
+
 	void AssemblyEditor::Clear() {
 		m_pEditorGUI = 0;
 		m_pModuleCombo = 0;
@@ -189,15 +197,15 @@ namespace RTE {
 		m_NeedSave = m_pEditorGUI->EditMade() || m_NeedSave;
 
 		// Get any mode change commands that the user gave the Editor GUI
-		if (m_pEditorGUI->GetActivatedPieSlice() == PieSlice::SliceType::EditorNew && m_EditorMode != NEWDIALOG) {
+		if (m_pEditorGUI->GetActivatedPieSlice() == PieSliceType::EditorNew && m_EditorMode != NEWDIALOG) {
 			m_pEditorGUI->SetEditorGUIMode(AssemblyEditorGUI::INACTIVE);
 			m_EditorMode = EditorActivity::NEWDIALOG;
 			m_ModeChange = true;
-		} else if (m_pEditorGUI->GetActivatedPieSlice() == PieSlice::SliceType::EditorLoad && m_EditorMode != LOADDIALOG) {
+		} else if (m_pEditorGUI->GetActivatedPieSlice() == PieSliceType::EditorLoad && m_EditorMode != LOADDIALOG) {
 			m_pEditorGUI->SetEditorGUIMode(AssemblyEditorGUI::INACTIVE);
 			m_EditorMode = EditorActivity::LOADDIALOG;
 			m_ModeChange = true;
-		} else if (m_pEditorGUI->GetActivatedPieSlice() == PieSlice::SliceType::EditorSave && m_EditorMode != SAVEDIALOG) {
+		} else if (m_pEditorGUI->GetActivatedPieSlice() == PieSliceType::EditorSave && m_EditorMode != SAVEDIALOG) {
 			m_pEditorGUI->SetEditorGUIMode(AssemblyEditorGUI::INACTIVE);
 			m_EditorMode = EditorActivity::SAVEDIALOG;
 			m_ModeChange = true;

Source/Activities/AssemblyEditor.h

@@ -1,5 +1,4 @@
-#ifndef _RTEASSEMBLYEDITOR_
-#define _RTEASSEMBLYEDITOR_
+#pragma once
 
 /// Header file for the AssemblyEditor class.
 /// @author Daniel Tabar
@@ -37,11 +36,11 @@ namespace RTE {
 
 		/// Constructor method used to instantiate a AssemblyEditor object in system
 		/// memory. Create() should be called before using the object.
-		AssemblyEditor() { Clear(); }
+		AssemblyEditor();
 
 		/// Destructor method used to clean up a AssemblyEditor object before deletion
 		/// from system memory.
-		~AssemblyEditor() override { Destroy(true); }
+		~AssemblyEditor() override;
 
 		/// Makes the AssemblyEditor object ready for use.
 		/// @return An error return value signaling sucess or any particular failure.
@@ -147,5 +146,3 @@ namespace RTE {
 	};
 
 } // namespace RTE
-
-#endif // File

Source/Activities/BaseEditor.cpp

@@ -24,6 +24,14 @@ namespace RTE {
 
 	ConcreteClassInfo(BaseEditor, Activity, 0);
 
+	BaseEditor::BaseEditor() {
+		Clear();
+	}
+
+	BaseEditor::~BaseEditor() {
+		Destroy(true);
+	}
+
 	void BaseEditor::Clear() {
 		m_pEditorGUI = 0;
 		m_NeedSave = false;
@@ -210,7 +218,7 @@ namespace RTE {
 
 		// Get any mode change commands that the user gave the Editor GUI
 		// Done with editing for now; save and return to campaign screen
-		if (m_pEditorGUI->GetActivatedPieSlice() == PieSlice::SliceType::EditorDone) {
+		if (m_pEditorGUI->GetActivatedPieSlice() == PieSliceType::EditorDone) {
 			m_pEditorGUI->SetEditorGUIMode(SceneEditorGUI::INACTIVE);
 
 			if (m_NeedSave)

Source/Activities/BaseEditor.h

@@ -1,5 +1,4 @@
-#ifndef _RTEBASEEDITOR_
-#define _RTEBASEEDITOR_
+#pragma once
 
 /// Header file for the BaseEditor class.
 /// @author Daniel Tabar
@@ -36,11 +35,11 @@ namespace RTE {
 
 		/// Constructor method used to instantiate a BaseEditor object in system
 		/// memory. Create() should be called before using the object.
-		BaseEditor() { Clear(); }
+		BaseEditor();
 
 		/// Destructor method used to clean up a BaseEditor object before deletion
 		/// from system memory.
-		~BaseEditor() override { Destroy(true); }
+		~BaseEditor() override;
 
 		/// Makes the BaseEditor object ready for use.
 		/// @return An error return value signaling sucess or any particular failure.
@@ -121,5 +120,3 @@ namespace RTE {
 	};
 
 } // namespace RTE
-
-#endif // File

Source/Activities/EditorActivity.cpp

@@ -23,6 +23,14 @@ namespace RTE {
 
 	AbstractClassInfo(EditorActivity, Activity);
 
+	EditorActivity::EditorActivity() {
+		Clear();
+	}
+
+	EditorActivity::~EditorActivity() {
+		Destroy(true);
+	}
+
 	void EditorActivity::Clear() {
 		// Most editors are single player affairs
 		m_MaxPlayerSupport = 1;