Fix mouse cursor not drawing in split-screen when custom BuyMenu theme cursors are enabled (followup to 50ddb65)

Author: MaximDude

GUI/GUIControlManager.cpp

@@ -313,25 +313,25 @@ void GUIControlManager::Draw(GUIScreen *pScreen) {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void GUIControlManager::DrawMouse() {
+void GUIControlManager::DrawMouse(GUIScreen *guiScreen) {
 	int MouseX;
 	int MouseY;
 	m_Input->GetMousePosition(&MouseX, &MouseY);
 
 	switch (m_CursorType) {
 		// Pointer
 		case Pointer:
-			m_Skin->DrawMouse(0, MouseX, MouseY);
+			m_Skin->DrawMouse(0, MouseX, MouseY, guiScreen);
 			break;
 
 			// Text
 		case Text:
-			m_Skin->DrawMouse(1, MouseX, MouseY);
+			m_Skin->DrawMouse(1, MouseX, MouseY, guiScreen);
 			break;
 
 			// Horizontal Resize
 		case HorSize:
-			m_Skin->DrawMouse(2, MouseX, MouseY);
+			m_Skin->DrawMouse(2, MouseX, MouseY, guiScreen);
 			break;
 		default:
 			break;

GUI/GUIControlManager.h

@@ -115,13 +115,11 @@ class GUIControlManager {
     void Draw(GUIScreen *pScreen);
 
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Method:          DrawMouse
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Draws the mouse.
-// Arguments:       None.
-
-    void DrawMouse();
+	/// <summary>
+	/// Draws the mouse to the backbuffer.
+	/// </summary>
+	/// <param name="pScreen">The GUIScreen to draw to, overriding the one passed in on construction.</param>
+	void DrawMouse(GUIScreen *guiScreen = nullptr);
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -224,7 +222,7 @@ class GUIControlManager {
 // Description:     Gets an event from the queue.
 // Arguments:       Pointer to variable receiving the Event.
 // Returns:         Returns true when an event was grabbed.
-//                  Returns false when there was no more events in the queue 
+//                  Returns false when there was no more events in the queue
 //                  OR the Event pointer is 0.
 
     bool GetEvent(GUIEvent *Event);

GUI/GUISkin.cpp

@@ -292,10 +292,12 @@ GUIBitmap * GUISkin::LoadMousePointer(const std::string &Section) {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void GUISkin::DrawMouse(int Image, int X, int Y) {
+void GUISkin::DrawMouse(int Image, int X, int Y, GUIScreen *guiScreenOverride) {
 	assert(Image >= 0 && Image <= 2);
 
-	if (m_MousePointers[Image]) { m_Screen->DrawBitmapTrans(m_MousePointers[Image], X - 1, Y - 1, nullptr); }
+	GUIScreen *targetScreen = guiScreenOverride ? guiScreenOverride : m_Screen;
+
+	if (m_MousePointers[Image]) { targetScreen->DrawBitmapTrans(m_MousePointers[Image], X - 1, Y - 1, nullptr); }
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

GUI/GUISkin.h

@@ -122,13 +122,14 @@ class GUISkin {
     GUIFont * GetFont(const std::string &Name);
 
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Method:          DrawMouse
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Draws the mouse onto the screen.
-// Arguments:       Mouse image ID, Position.
-
-    void DrawMouse(int Image, int X, int Y);
+    /// <summary>
+    /// Draws the mouse onto the screen.
+    /// </summary>
+    /// <param name="Image">Mouse image ID.</param>
+    /// <param name="X">Horizontal position on the screen.</param>
+    /// <param name="Y">Vertical position on the screen.</param>
+	/// <param name="pScreen">The GUIScreen to draw to, overriding the one passed in on construction.</param>
+    void DrawMouse(int Image, int X, int Y, GUIScreen *guiScreenOverride = nullptr);
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -150,7 +151,7 @@ class GUISkin {
 //                  An optional target color depth that will determine what format the color
 //                  should be converted to. If this is 0, then the current video color depth
 //                  will be used as target.
-    
+
     unsigned long ConvertColor(unsigned long color, int targetDepth = 0);
 
 

Menus/BuyMenuGUI.cpp

@@ -2063,7 +2063,7 @@ void BuyMenuGUI::Draw(BITMAP *drawBitmap) const {
 		if (g_SettingsMan.FactionBuyMenuThemeCursorsDisabled()) {
 			draw_sprite(drawBitmap, s_pCursor, m_CursorPos.GetFloorIntX(), m_CursorPos.GetFloorIntY());
 		} else {
-			m_pGUIController->DrawMouse();
+			m_pGUIController->DrawMouse(&drawScreen);
 		}
 	}
 }

Menus/ObjectPickerGUI.cpp

@@ -602,7 +602,7 @@ namespace RTE {
 			if (g_SettingsMan.FactionBuyMenuThemeCursorsDisabled()) {
 				draw_sprite(drawBitmap, s_Cursor, m_CursorPos.GetFloorIntX(), m_CursorPos.GetFloorIntY());
 			} else {
-				m_GUIControlManager->DrawMouse();
+				m_GUIControlManager->DrawMouse(&drawScreen);
 			}
 		}
 	}