From 5f6232a9f5924440a410c6e15986eac983ebe771 Mon Sep 17 00:00:00 2001
From: Thien Trandinh <trandit@mcmaster.ca>
Date: Wed, 2 Nov 2016 01:51:11 -0400
Subject: [PATCH] Fixed issue where even though dropdownmenu wasnt displayed,
it was still clickable - resulting in it preventing player from moving unit
to where dropdownmenu was previously
---
src/Blaze-Brigade/Blaze_Brigade/Game.cs | 2 +-
src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Game.cs b/src/Blaze-Brigade/Blaze_Brigade/Game.cs
index 17799ed..fa32d84 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Game.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Game.cs
@@ -224,7 +224,7 @@ namespace Controller
#endregion
#region Drop Down menu
- if (GameState.getMenuOpen()) // if dropDowMenu should be opened, draw dropDownMenu
+ if ((GameState.getMenuOpen())&&(!GameState.getIsAnimating())) // if dropDowMenu should be opened, draw dropDownMenu
{
foreach (MenuButton button in unit.getMenuButtons())
{
diff --git a/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs b/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
index 02630ee..595a505 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
@@ -159,7 +159,10 @@ namespace Controller
int buttonY = (int) menuButtons[i].getPixelCoordinates().Y;
if (buttonX <= clickX && clickX < buttonX+128 && buttonY <= clickY && clickY < buttonY+32)
{
+ if (GameState.getMenuOpen())
+ {
return menuButtons[i];
+ }
}
}
return null;
--
GitLab