Add settings flag to disable custom BuyMenu skin cursors

Author: MaximDude

Managers/SettingsMan.cpp

@@ -48,6 +48,7 @@ namespace RTE {
 		m_SimplifiedCollisionDetection = false;
 		m_SceneBackgroundAutoScaleMode = 1;
 		m_DisableFactionBuyMenuThemes = false;
+		m_DisableFactionBuyMenuThemeCursors = false;
 		m_PathFinderGridNodeSize = c_PPM;
 		m_AIUpdateInterval = 2;
 
@@ -195,6 +196,8 @@ namespace RTE {
 			SetSceneBackgroundAutoScaleMode(std::stoi(reader.ReadPropValue()));
 		} else if (propName == "DisableFactionBuyMenuThemes") {
 			reader >> m_DisableFactionBuyMenuThemes;
+		} else if (propName == "DisableFactionBuyMenuThemeCursors") {
+			reader >> m_DisableFactionBuyMenuThemeCursors;
 		} else if (propName == "PathFinderGridNodeSize") {
 			reader >> m_PathFinderGridNodeSize;
 		} else if (propName == "AIUpdateInterval") {
@@ -388,6 +391,7 @@ namespace RTE {
 		writer.NewPropertyWithValue("SimplifiedCollisionDetection", m_SimplifiedCollisionDetection);
 		writer.NewPropertyWithValue("SceneBackgroundAutoScaleMode", m_SceneBackgroundAutoScaleMode);
 		writer.NewPropertyWithValue("DisableFactionBuyMenuThemes", m_DisableFactionBuyMenuThemes);
+		writer.NewPropertyWithValue("DisableFactionBuyMenuThemeCursors", m_DisableFactionBuyMenuThemeCursors);
 		writer.NewPropertyWithValue("PathFinderGridNodeSize", m_PathFinderGridNodeSize);
 		writer.NewPropertyWithValue("AIUpdateInterval", m_AIUpdateInterval);
 		writer.NewPropertyWithValue("EnableParticleSettling", g_MovableMan.m_SettlingEnabled);

Managers/SettingsMan.h

@@ -93,6 +93,18 @@ namespace RTE {
 		/// <param name="disable">Whether faction BuyMenu theme support is disabled or not.</param>
 		void SetFactionBuyMenuThemesDisabled(bool disable) { m_DisableFactionBuyMenuThemes = disable; }
 
+		/// <summary>
+		/// Gets whether custom cursor support in faction BuyMenu themes is disabled.
+		/// </summary>
+		/// <returns>Whether faction BuyMenu theme support is disabled.</returns>
+		bool FactionBuyMenuThemeCursorsDisabled() const { return m_DisableFactionBuyMenuThemeCursors; }
+
+		/// <summary>
+		/// Sets whether custom cursor support in faction BuyMenu themes is disabled.
+		/// </summary>
+		/// <param name="disable">Whether custom cursor support in faction BuyMenu themes is disabled or not.</param>
+		void SetFactionBuyMenuThemeCursorsDisabled(bool disable) { m_DisableFactionBuyMenuThemeCursors = disable; }
+
 		/// <summary>
 		/// Gets the PathFinder grid node size.
 		/// </summary>
@@ -521,6 +533,7 @@ namespace RTE {
 		bool m_SimplifiedCollisionDetection; //!< Whether simplified collision detection (reduced MOID layer sampling) is enabled.
 		int m_SceneBackgroundAutoScaleMode; //!< Scene background layer auto-scaling mode. 0 for off, 1 for fit screen dimensions and 2 for always upscaled to x2.
 		bool m_DisableFactionBuyMenuThemes; //!< Whether faction BuyMenu theme support is disabled.
+		bool m_DisableFactionBuyMenuThemeCursors; //!< Whether custom cursor support in faction BuyMenu themes is disabled.
 		int m_PathFinderGridNodeSize; //!< The grid size used by the PathFinder, in pixels.
 		int m_AIUpdateInterval; //!< How often actor's AI should be updated, i.e. every n simulation updates.
 

Menus/BuyMenuGUI.cpp

@@ -2049,21 +2049,18 @@ void BuyMenuGUI::Update()
     }
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Virtual Method:  Draw
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Draws the menu
-
-void BuyMenuGUI::Draw(BITMAP *drawBitmap) const
-{
-    AllegroScreen drawScreen(drawBitmap);
-    m_pGUIController->Draw(&drawScreen);
-
-    // Draw the cursor on top of everything
-    if (IsEnabled() && m_pController->IsMouseControlled())
-        m_pGUIController->DrawMouse();
-        //draw_sprite(drawBitmap, s_pCursor, m_CursorPos.GetFloorIntX(), m_CursorPos.GetFloorIntY());
+void BuyMenuGUI::Draw(BITMAP *drawBitmap) const {
+	AllegroScreen drawScreen(drawBitmap);
+	m_pGUIController->Draw(&drawScreen);
+	if (IsEnabled() && m_pController->IsMouseControlled()) {
+		if (g_SettingsMan.FactionBuyMenuThemeCursorsDisabled()) {
+			draw_sprite(drawBitmap, s_pCursor, m_CursorPos.GetFloorIntX(), m_CursorPos.GetFloorIntY());
+		} else {
+			m_pGUIController->DrawMouse();
+		}
+	}
 }
 
 /*

Menus/ObjectPickerGUI.cpp

@@ -599,8 +599,11 @@ namespace RTE {
 		AllegroScreen drawScreen(drawBitmap);
 		m_GUIControlManager->Draw(&drawScreen);
 		if (IsEnabled() && m_Controller->IsMouseControlled()) {
-			m_GUIControlManager->DrawMouse();
-			//draw_sprite(drawBitmap, s_Cursor, m_CursorPos.GetFloorIntX(), m_CursorPos.GetFloorIntY());
+			if (g_SettingsMan.FactionBuyMenuThemeCursorsDisabled()) {
+				draw_sprite(drawBitmap, s_Cursor, m_CursorPos.GetFloorIntX(), m_CursorPos.GetFloorIntY());
+			} else {
+				m_GUIControlManager->DrawMouse();
+			}
 		}
 	}
 }