Renamed Direction enum to Directions, for consistency. Also added the Any direction for future use

Author: garethyr

Menus/InventoryMenuGUI.cpp

@@ -928,18 +928,18 @@ namespace RTE {
 		}
 
 		GUIButton *nextButtonToHighlight = nullptr;
-		Direction pressedDirection = GetNonMouseButtonControllerMovement();
+		Directions pressedDirection = GetNonMouseButtonControllerMovement();
 		switch (pressedDirection) {
-			case Direction::Up:
+			case Directions::Up:
 				nextButtonToHighlight = HandleNonMouseUpInput();
 				break;
-			case Direction::Down:
+			case Directions::Down:
 				nextButtonToHighlight = HandleNonMouseDownInput();
 				break;
-			case Direction::Left:
+			case Directions::Left:
 				nextButtonToHighlight = HandleNonMouseLeftInput();
 				break;
-			case Direction::Right:
+			case Directions::Right:
 				nextButtonToHighlight = HandleNonMouseRightInput();
 				break;
 			default:
@@ -955,14 +955,14 @@ namespace RTE {
 			m_NonMouseHighlightedButton->OnMouseLeave(0, 0, 0, 0);
 			m_NonMouseHighlightedButton = nextButtonToHighlight;
 			m_NonMouseHighlightedButton->OnMouseEnter(0, 0, 0, 0);
-		} else if (!nextButtonToHighlight && pressedDirection != Direction::None) {
+		} else if (!nextButtonToHighlight && pressedDirection != Directions::None) {
 			g_GUISound.UserErrorSound()->Play(m_MenuController->GetPlayer());
 		}
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	Direction InventoryMenuGUI::GetNonMouseButtonControllerMovement() {
+	Directions InventoryMenuGUI::GetNonMouseButtonControllerMovement() {
 		bool pressUp = m_MenuController->IsState(ControlState::PRESS_UP) || m_MenuController->IsState(ControlState::SCROLL_UP);
 		bool pressDown = m_MenuController->IsState(ControlState::PRESS_DOWN) || m_MenuController->IsState(ControlState::SCROLL_DOWN);
 		bool pressLeft = m_MenuController->IsState(ControlState::PRESS_LEFT);
@@ -984,15 +984,15 @@ namespace RTE {
 			m_GUIRepeatTimer.Reset();
 		}
 		if (pressUp) {
-			return Direction::Up;
+			return Directions::Up;
 		} else if (pressDown) {
-			return Direction::Down;
+			return Directions::Down;
 		} else if (pressLeft) {
-			return Direction::Left;
+			return Directions::Left;
 		} else if (pressRight) {
-			return Direction::Right;
+			return Directions::Right;
 		}
-		return Direction::None;
+		return Directions::None;
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Menus/InventoryMenuGUI.h

@@ -392,8 +392,8 @@ namespace RTE {
 		/// <summary>
 		/// Gets any keyboard or gamepad directional input.
 		/// </summary>
-		/// <returns>The direction of found input. Priority matches ordering of the Direction enumeration.</returns>
-		Direction GetNonMouseButtonControllerMovement();
+		/// <returns>The direction of found input. Priority matches ordering of the Directions enumeration.</returns>
+		Directions GetNonMouseButtonControllerMovement();
 
 		/// <summary>
 		/// Breakdown of HandleNonMouseInput for handling pressing/holding up.

System/Constants.h

@@ -229,9 +229,9 @@ namespace RTE {
 	};
 
 	/// <summary>
-	/// Enumeration for cardinal directions, as well as None.
+	/// Enumeration for cardinal directions, as well as None and Any.
 	/// </summary>
-	enum class Direction { None = -1, Up, Down, Left, Right };
+	enum Directions { None = -1, Up, Down, Left, Right, Any };
 #pragma endregion
 
 #pragma region Un-Definitions