reformat

HeliumAnt · HeliumAnt · commit 27d409a89cb1 · 2024-01-20T16:47:09.000+01:00
diff --git a/Source/Entities/AtomGroup.h b/Source/Entities/AtomGroup.h
@@ -389,9 +389,11 @@ namespace RTE {
 		/// <summary>
 		/// Enumeration for how the AtomGroup's area is distributed. Linear means it acts a 2D line whereas Circle/Square acts as a pseudo-3d circle/square.
 		/// </summary>
-		enum class AreaDistributionType { Linear,
-			                                Circle,
-			                                Square };
+		enum class AreaDistributionType {
+			Linear,
+			Circle,
+			Square
+		};
 
 		static const std::unordered_map<std::string, AreaDistributionType> c_AreaDistributionTypeMap; //!< A map of strings to AreaDistributionTypes to support string parsing for the AreaDistributionType enum.
 
diff --git a/Source/Entities/Gib.h b/Source/Entities/Gib.h
@@ -21,9 +21,11 @@ namespace RTE {
 		/// <summary>
 		/// Different types of logic for the Gib to use when applying velocity to its GibParticles.
 		/// </summary>
-		enum SpreadMode { SpreadRandom,
-			                SpreadEven,
-			                SpreadSpiral };
+		enum SpreadMode {
+			SpreadRandom,
+			SpreadEven,
+			SpreadSpiral
+		};
 
 #pragma region Creation
 		/// <summary>
diff --git a/Source/Entities/PieMenu.h b/Source/Entities/PieMenu.h
@@ -395,31 +395,39 @@ namespace RTE {
 		/// <summary>
 		/// Enumeration for enabled states when enabling/disabling the PieMenu.
 		/// </summary>
-		enum class EnabledState { Enabling,
-			                        Enabled,
-			                        Disabling,
-			                        Disabled };
+		enum class EnabledState {
+			Enabling,
+			Enabled,
+			Disabling,
+			Disabled
+		};
 
 		/// <summary>
 		/// Enumeration for the modes a PieMenu can have.
 		/// </summary>
-		enum class MenuMode { Normal,
-			                    Wobble,
-			                    Freeze };
+		enum class MenuMode {
+			Normal,
+			Wobble,
+			Freeze
+		};
 
 		/// <summary>
 		/// Enumeration for the different item separator modes available to the PieMenu.
 		/// </summary>
-		enum class IconSeparatorMode { Line,
-			                             Circle,
-			                             Square };
+		enum class IconSeparatorMode {
+			Line,
+			Circle,
+			Square
+		};
 
 		/// <summary>
 		/// Enumeration for helping keyboard PieMenu navigation. Specifies the ways the cursor should move from one PieQuadrant to another.
 		/// </summary>
-		enum class MoveToPieQuadrantMode { Start,
-			                                 Middle,
-			                                 End };
+		enum class MoveToPieQuadrantMode {
+			Start,
+			Middle,
+			End
+		};
 
 		static constexpr int c_EnablingDelay = 50; //!< Time in ms for how long it takes to enable/disable.
 		static constexpr int c_DefaultFullRadius = 58; //!< The radius the menu should have when fully enabled, in pixels.
diff --git a/Source/Entities/SLBackground.h b/Source/Entities/SLBackground.h
@@ -210,10 +210,12 @@ namespace RTE {
 		/// <summary>
 		/// Enumeration for the different modes of SLBackground auto-scaling.
 		/// </summary>
-		enum LayerAutoScaleMode { AutoScaleOff,
-			                        FitScreen,
-			                        AlwaysUpscaled,
-			                        LayerAutoScaleModeCount };
+		enum LayerAutoScaleMode {
+			AutoScaleOff,
+			FitScreen,
+			AlwaysUpscaled,
+			LayerAutoScaleModeCount
+		};
 
 		static Entity::ClassInfo m_sClass; //!< ClassInfo for this class.
 
diff --git a/Source/Entities/SLTerrain.h b/Source/Entities/SLTerrain.h
@@ -24,9 +24,11 @@ namespace RTE {
 		/// <summary>
 		/// Enumeration for the different type of layers in the SLTerrain.
 		/// </summary>
-		enum class LayerType { ForegroundLayer,
-			                     BackgroundLayer,
-			                     MaterialLayer };
+		enum class LayerType {
+			ForegroundLayer,
+			BackgroundLayer,
+			MaterialLayer
+		};
 
 #pragma region Creation
 		/// <summary>
diff --git a/Source/Entities/SceneObject.h b/Source/Entities/SceneObject.h
@@ -40,10 +40,12 @@ namespace RTE {
 		/// <summary>
 		/// Enumeration for the different buyable modes of this SceneObject.
 		/// </summary>
-		enum class BuyableMode { NoRestrictions,
-			                       BuyMenuOnly,
-			                       ObjectPickerOnly,
-			                       ScriptOnly };
+		enum class BuyableMode {
+			NoRestrictions,
+			BuyMenuOnly,
+			ObjectPickerOnly,
+			ScriptOnly
+		};
 
 		//////////////////////////////////////////////////////////////////////////////////////////
 		// Nested class:    SOPlacer
diff --git a/Source/GUI/GUIRadioButton.cpp b/Source/GUI/GUIRadioButton.cpp
@@ -153,7 +153,7 @@ void GUIRadioButton::Draw(GUIScreen* Screen) {
 		if (m_Enabled) {
 			m_Image->DrawTrans(Screen->GetBitmap(), m_X, YPos, &m_ImageRects[2]);
 		} // else {
-		  // m_Image->DrawTrans(Screen->GetBitmap(), m_X, YPos, &m_ImageRects[3]);
+		// m_Image->DrawTrans(Screen->GetBitmap(), m_X, YPos, &m_ImageRects[3]);
 		//}
 	}
 
diff --git a/Source/GUI/GUITab.cpp b/Source/GUI/GUITab.cpp
@@ -152,7 +152,7 @@ void GUITab::Draw(GUIScreen* Screen) {
 		if (m_Enabled) {
 			m_Image->DrawTrans(Screen->GetBitmap(), m_X, YPos, &m_ImageRects[2]);
 		} // else
-		  // m_Image->DrawTrans(Screen->GetBitmap(), m_X, YPos, &m_ImageRects[3]);
+		// m_Image->DrawTrans(Screen->GetBitmap(), m_X, YPos, &m_ImageRects[3]);
 		//}
 	}
 
diff --git a/Source/Managers/ConsoleMan.h b/Source/Managers/ConsoleMan.h
@@ -158,10 +158,12 @@ namespace RTE {
 		/// <summary>
 		/// Enumeration for console states when enabling/disabling the console. NOTE: This can't be lower down because m_ConsoleState relies on this definition.
 		/// </summary>
-		enum ConsoleState { Enabling = 0,
-			                  Enabled,
-			                  Disabling,
-			                  Disabled };
+		enum ConsoleState {
+			Enabling = 0,
+			Enabled,
+			Disabling,
+			Disabled
+		};
 
 		ConsoleState m_ConsoleState; //!< Current state of the console.
 		bool m_ReadOnly; //!< Read-only mode where console text input is disabled and controller input should be preserved.
diff --git a/Source/Managers/FrameMan.h b/Source/Managers/FrameMan.h
@@ -488,10 +488,12 @@ namespace RTE {
 		/// <summary>
 		/// Enumeration with different settings for the SaveBitmap() method.
 		/// </summary>
-		enum SaveBitmapMode { SingleBitmap,
-			                    ScreenDump,
-			                    WorldDump,
-			                    ScenePreviewDump };
+		enum SaveBitmapMode {
+			SingleBitmap,
+			ScreenDump,
+			WorldDump,
+			ScenePreviewDump
+		};
 
 		static const std::array<std::function<void(int r, int g, int b, int a)>, DrawBlendMode::BlendModeCount> c_BlenderSetterFunctions; //!< Array of function references to Allegro blender setters for convenient access when creating new color tables.
 
diff --git a/Source/Managers/NetworkClient.cpp b/Source/Managers/NetworkClient.cpp
@@ -842,7 +842,7 @@ namespace RTE {
 				set_clip_rect(targetBitmap, targetBox.GetCorner().m_X, targetBox.GetCorner().m_Y, targetBox.GetCorner().m_X + targetBox.GetWidth() - 1, targetBox.GetCorner().m_Y + targetBox.GetHeight() - 1);
 
 				// Choose the correct blitting function based on transparency setting
-				void (*pfBlit)(BITMAP * source, BITMAP * dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height) = m_BackgroundLayers[frame][i].DrawTrans ? &masked_blit : &blit;
+				void (*pfBlit)(BITMAP* source, BITMAP* dest, int source_x, int source_y, int dest_x, int dest_y, int width, int height) = m_BackgroundLayers[frame][i].DrawTrans ? &masked_blit : &blit;
 
 				// See if this SceneLayer is wider AND higher than the target bitmap; then use simple wrapping logic - otherwise need to tile
 				if (m_BackgroundBitmaps[i]->w >= targetBitmap->w && m_BackgroundBitmaps[i]->h >= targetBitmap->h) {
diff --git a/Source/Managers/SceneMan.cpp b/Source/Managers/SceneMan.cpp
@@ -2118,8 +2118,8 @@ namespace RTE {
 					MovableObject* pHitMO = g_MovableMan.GetMOFromID(checkMOID);
 					if (pHitMO) {
 						checkMOID = pHitMO->GetRootID();
-#ifdef DRAW_MOID_LAYER // Unnecessary with non-drawn MOIDs - they'll be culled out at the spatial partition level.
-						// Check if we're supposed to ignore the team of what we hit
+#ifdef DRAW_MOID_LAYER // Unnecessary with non-drawn MOIDs - they'll be culled out at the spatial partition level. \
+    // Check if we're supposed to ignore the team of what we hit
 						if (ignoreTeam != Activity::NoTeam) {
 							pHitMO = pHitMO->GetRootParent();
 							// We are indeed supposed to ignore this object because of its ignoring of its specific team
diff --git a/Source/Managers/UInputMan.h b/Source/Managers/UInputMan.h
@@ -28,9 +28,11 @@ namespace RTE {
 		/// <summary>
 		/// Enumeration for the mouse cursor actions in menus.
 		/// </summary>
-		enum MenuCursorButtons { MENU_PRIMARY,
-			                       MENU_SECONDARY,
-			                       MENU_EITHER };
+		enum MenuCursorButtons {
+			MENU_PRIMARY,
+			MENU_SECONDARY,
+			MENU_EITHER
+		};
 
 #pragma region Creation
 		/// <summary>
@@ -654,10 +656,12 @@ namespace RTE {
 		/// <summary>
 		/// Enumeration for the different states an input element or button can be in.
 		/// </summary>
-		enum InputState { Held,
-			                Pressed,
-			                Released,
-			                InputStateCount };
+		enum InputState {
+			Held,
+			Pressed,
+			Released,
+			InputStateCount
+		};
 
 		static std::array<uint8_t, SDL_NUM_SCANCODES> s_PrevKeyStates; //!< Key states as they were the previous update.
 		static std::array<uint8_t, SDL_NUM_SCANCODES> s_ChangedKeyStates; //!< Key states that have changed.
diff --git a/Source/Menus/InventoryMenuGUI.h b/Source/Menus/InventoryMenuGUI.h
@@ -31,9 +31,11 @@ namespace RTE {
 		/// <summary>
 		/// Enumeration for the modes an InventoryMenuGUI can have.
 		/// </summary>
-		enum class MenuMode { Carousel,
-			                    Full,
-			                    Transfer };
+		enum class MenuMode {
+			Carousel,
+			Full,
+			Transfer
+		};
 
 #pragma region Creation
 		/// <summary>
@@ -207,17 +209,21 @@ namespace RTE {
 		/// <summary>
 		/// Enumeration for enabled states when enabling/disabling the InventoryMenuGUI.
 		/// </summary>
-		enum class EnabledState { Enabling,
-			                        Enabled,
-			                        Disabling,
-			                        Disabled };
+		enum class EnabledState {
+			Enabling,
+			Enabled,
+			Disabling,
+			Disabled
+		};
 
 		/// <summary>
 		/// Enumeration for which direction an inventory is being swapped in.
 		/// </summary>
-		enum class CarouselAnimationDirection { Left = -1,
-			                                      None,
-			                                      Right };
+		enum class CarouselAnimationDirection {
+			Left = -1,
+			None,
+			Right
+		};
 
 		static constexpr int c_ItemsPerRow = 5; //!< The number of items per row of the inventory display. MUST be an odd number. Used in all MenuModes.
 		static constexpr int c_MinimumItemPadding = 1; //!< The padding between item icons and their containing boxes. Items will have at least this much padding on all sides. Used in all MenuModes.
diff --git a/Source/Menus/MetagameGUI.h b/Source/Menus/MetagameGUI.h
@@ -57,15 +57,15 @@ namespace RTE {
 		    public :
 
 		    enum MenuScreens {
-			    ROOTBOX = 0,
-			    NEWDIALOG,
-			    LOADDIALOG,
-			    SAVEDIALOG,
-			    MENUDIALOG,
-			    STATSDIALOG,
-			    SCENEINFOBOX,
-			    SCREENCOUNT
-		    };
+			ROOTBOX = 0,
+			NEWDIALOG,
+			LOADDIALOG,
+			SAVEDIALOG,
+			MENUDIALOG,
+			STATSDIALOG,
+			SCENEINFOBOX,
+			SCREENCOUNT
+		};
 
 		// For storing lines to be drawn upon draw time
 		struct SiteLine {
diff --git a/Source/Menus/ObjectPickerGUI.h b/Source/Menus/ObjectPickerGUI.h
@@ -169,16 +169,20 @@ namespace RTE {
 		/// <summary>
 		/// Enumeration for ObjectPicker states when enabling/disabling the ObjectPicker.
 		/// </summary>
-		enum class PickerState { Enabling,
-			                       Enabled,
-			                       Disabling,
-			                       Disabled };
+		enum class PickerState {
+			Enabling,
+			Enabled,
+			Disabling,
+			Disabled
+		};
 
 		/// <summary>
 		/// Enumeration for the ObjectPicker columns ListBox focus states.
 		/// </summary>
-		enum class PickerFocus { GroupList,
-			                       ObjectList };
+		enum class PickerFocus {
+			GroupList,
+			ObjectList
+		};
 
 		static BITMAP* s_Cursor; //!< The cursor image shared by all pickers.
 
diff --git a/Source/Menus/ScenarioActivityConfigGUI.h b/Source/Menus/ScenarioActivityConfigGUI.h
@@ -65,14 +65,18 @@ namespace RTE {
 		/// <summary>
 		/// Enumeration for all the player columns in the player setup box. "Extends" the Players enumeration by adding an entry for the CPU player.
 		/// </summary>
-		enum PlayerColumns { PlayerCPU = Players::MaxPlayerCount,
-			                   PlayerColumnCount };
+		enum PlayerColumns {
+			PlayerCPU = Players::MaxPlayerCount,
+			PlayerColumnCount
+		};
 
 		/// <summary>
 		/// Enumeration for all the team rows in the player setup box. "Extends" the Teams enumeration by adding an entry for unused (disabled) Team.
 		/// </summary>
-		enum TeamRows { DisabledTeam = Activity::Teams::MaxTeamCount,
-			              TeamRowCount };
+		enum TeamRows {
+			DisabledTeam = Activity::Teams::MaxTeamCount,
+			TeamRowCount
+		};
 
 		GUIControlManager* m_GUIControlManager; //!< The GUIControlManager which holds all the GUIControls of this menu. Not owned by this.
 
diff --git a/Source/Menus/SettingsInputMappingWizardGUI.h b/Source/Menus/SettingsInputMappingWizardGUI.h
@@ -74,9 +74,11 @@ namespace RTE {
 		/// <summary>
 		/// Enumeration for the different types of gamepads that can be configured.
 		/// </summary>
-		enum GamepadType { DPad,
-			                 AnalogDualShock,
-			                 AnalogXbox };
+		enum GamepadType {
+			DPad,
+			AnalogDualShock,
+			AnalogXbox
+		};
 
 		/// <summary>
 		/// Struct containing GUI elements that compose the input mapping wizard manual configuration menu screen.
diff --git a/Source/Menus/TitleScreen.h b/Source/Menus/TitleScreen.h
@@ -153,9 +153,11 @@ namespace RTE {
 			/// <summary>
 			/// Enumeration for the different Star sizes.
 			/// </summary>
-			enum class StarSize { StarSmall,
-				                    StarLarge,
-				                    StarHuge };
+			enum class StarSize {
+				StarSmall,
+				StarLarge,
+				StarHuge
+			};
 
 			StarSize Size; //!< The size of the Star. Used for the appropriate Bitmap selection and Intensity randomization when drawing.
 			BITMAP* Bitmap; //!< The bitmap to draw, not owned by this. Not Owned.
diff --git a/Source/System/Atom.h b/Source/System/Atom.h
@@ -10,8 +10,10 @@ namespace RTE {
 	class SLTerrain;
 	class MovableObject;
 
-	enum { HITOR = 0,
-		     HITEE = 1 };
+	enum {
+		HITOR = 0,
+		HITEE = 1
+	};
 
 #pragma region HitData
 	/// <summary>
diff --git a/Source/System/Constants.h b/Source/System/Constants.h
diff --git a/Source/System/ContentFile.h b/Source/System/ContentFile.h
diff --git a/Source/System/RTEError.cpp b/Source/System/RTEError.cpp
diff --git a/Source/System/Vector.h b/Source/System/Vector.h

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ void GUIRadioButton::Draw(GUIScreen* Screen) {`
`153`	`153`	`if (m_Enabled) {`
`154`	`154`	`m_Image->DrawTrans(Screen->GetBitmap(), m_X, YPos, &m_ImageRects[2]);`
`155`	`155`	`} // else {`
`156`		`- // m_Image->DrawTrans(Screen->GetBitmap(), m_X, YPos, &m_ImageRects[3]);`
	`156`	`+ // m_Image->DrawTrans(Screen->GetBitmap(), m_X, YPos, &m_ImageRects[3]);`
`157`	`157`	`//}`
`158`	`158`	`}`
`159`	`159`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ void GUITab::Draw(GUIScreen* Screen) {`
`152`	`152`	`if (m_Enabled) {`
`153`	`153`	`m_Image->DrawTrans(Screen->GetBitmap(), m_X, YPos, &m_ImageRects[2]);`
`154`	`154`	`} // else`
`155`		`- // m_Image->DrawTrans(Screen->GetBitmap(), m_X, YPos, &m_ImageRects[3]);`
	`155`	`+ // m_Image->DrawTrans(Screen->GetBitmap(), m_X, YPos, &m_ImageRects[3]);`
`156`	`156`	`//}`
`157`	`157`	`}`
`158`	`158`