Merge branch 'development' into zip-save-files

Author: Causeless

.clang-format

@@ -50,10 +50,6 @@ ForEachMacros:
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
-StatementMacros:
-  - SerializableClassNameGetter
-  - SerializableOverrideMethods
-  - ClassInfoGetters
 IncludeBlocks:   Preserve
 IndentCaseLabels: true
 IndentGotoLabels: true
@@ -98,6 +94,10 @@ SpaceBeforeSquareBrackets: false
 #InsertNewlineAtEOF: true
 Standard:        c++17
 StatementMacros:
+  - SerializableClassNameGetter
+  - SerializableOverrideMethods
+  - ClassInfoGetters
+  - EntityAllocation
   - Q_UNUSED
   - QT_REQUIRE_VERSION
 TabWidth: 4

Source/Entities/PieMenu.h

@@ -18,12 +18,12 @@ namespace RTE {
 
 	public:
 		EntityAllocation(PieMenu)
-		    SerializableOverrideMethods
-		    ClassInfoGetters
+		SerializableOverrideMethods
+		ClassInfoGetters
 
 #pragma region Creation
-		    /// Constructor method used to instantiate a PieMenu object in system memory. Create() should be called before using the object.
-		    PieMenu();
+		/// Constructor method used to instantiate a PieMenu object in system memory. Create() should be called before using the object.
+		PieMenu();
 
 		/// Makes the PieMenu object ready for use.
 		/// @return An error return value signaling success or any particular failure. Anything below 0 is an error signal.

Source/Entities/Scene.h

@@ -200,9 +200,9 @@ namespace RTE {
 		// Concrete allocation and cloning definitions
 		EntityAllocation(Scene)
 
-		    /// Constructor method used to instantiate a Scene object in system
-		    /// memory. Create() should be called before using the object.
-		    Scene();
+		/// Constructor method used to instantiate a Scene object in system
+		/// memory. Create() should be called before using the object.
+		Scene();
 
 		/// Destructor method used to clean up a Scene object before deletion
 		/// from system memory.

Source/Entities/TerrainFrosting.h

@@ -11,11 +11,11 @@ namespace RTE {
 
 	public:
 		SerializableClassNameGetter
-		    SerializableOverrideMethods
+		SerializableOverrideMethods
 
 #pragma region Creation
-		    /// Constructor method used to instantiate a TerrainFrosting object in system memory and make it ready for use.
-		    TerrainFrosting() {
+		/// Constructor method used to instantiate a TerrainFrosting object in system memory and make it ready for use.
+		TerrainFrosting() {
 			Clear();
 		}
 #pragma endregion