From 9e6fb1b9f853e6c0c6e0b26bd21f29dfc1b2e951 Mon Sep 17 00:00:00 2001
From: DinkyDyeAussie <travis.m.greer_32@hotmail.com>
Date: Mon, 19 Sep 2016 20:18:40 +1000
Subject: [PATCH] Changed code to menu buttons

Trying to get buttons to behave like they did in Warcraft 2
---
 src/ui/mainscr.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/ui/mainscr.cpp b/src/ui/mainscr.cpp
index 359f34787..3f27fc373 100644
--- a/src/ui/mainscr.cpp
+++ b/src/ui/mainscr.cpp
@@ -76,7 +76,8 @@ static void DrawMenuButtonArea_noNetwork()
 		DrawUIButton(UI.MenuButton.Style,
 					 (ButtonAreaUnderCursor == ButtonAreaMenu
 					  && ButtonUnderCursor == ButtonUnderMenu ? MI_FLAGS_ACTIVE : 0) |
-					 (GameMenuButtonClicked ? MI_FLAGS_CLICKED : 0),
+					 // (GameMenuButtonClicked ? MI_FLAGS_CLICKED : 0),
+					 (UI.MenuButton.Clicked ? MI_FLAGS_CLICKED : 0),
 					 UI.MenuButton.X, UI.MenuButton.Y,
 					 UI.MenuButton.Text);
 	}
@@ -88,7 +89,8 @@ static void DrawMenuButtonArea_Network()
 		DrawUIButton(UI.NetworkMenuButton.Style,
 					 (ButtonAreaUnderCursor == ButtonAreaMenu
 					  && ButtonUnderCursor == ButtonUnderNetworkMenu ? MI_FLAGS_ACTIVE : 0) |
-					 (GameMenuButtonClicked ? MI_FLAGS_CLICKED : 0),
+					 // (GameMenuButtonClicked ? MI_FLAGS_CLICKED : 0),
+					 (UI.NetworkMenuButton.Clicked ? MI_FLAGS_CLICKED : 0),
 					 UI.NetworkMenuButton.X, UI.NetworkMenuButton.Y,
 					 UI.NetworkMenuButton.Text);
 	}
@@ -96,7 +98,8 @@ static void DrawMenuButtonArea_Network()
 		DrawUIButton(UI.NetworkDiplomacyButton.Style,
 					 (ButtonAreaUnderCursor == ButtonAreaMenu
 					  && ButtonUnderCursor == ButtonUnderNetworkDiplomacy ? MI_FLAGS_ACTIVE : 0) |
-					 (GameDiplomacyButtonClicked ? MI_FLAGS_CLICKED : 0),
+					 // (GameDiplomacyButtonClicked ? MI_FLAGS_CLICKED : 0),
+					 (UI.NetworkDiplomacyButton.Clicked ? MI_FLAGS_CLICKED : 0),
 					 UI.NetworkDiplomacyButton.X, UI.NetworkDiplomacyButton.Y,
 					 UI.NetworkDiplomacyButton.Text);
 	}