From bcb037bed8fb90e369d21d1e96643ec9ae06933c Mon Sep 17 00:00:00 2001
From: Susan Yuen <susan_loves_cheese@hotmail.com>
Date: Mon, 28 Nov 2016 19:43:01 -0500
Subject: [PATCH] Does not deselect when misclicks occur when unit is selected
---
src/Blaze-Brigade/Blaze_Brigade/Game.cs | 2 +-
src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/Blaze-Brigade/Blaze_Brigade/Game.cs b/src/Blaze-Brigade/Blaze_Brigade/Game.cs
index 5a49a0c..05c0d77 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/Game.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/Game.cs
@@ -159,7 +159,7 @@ namespace Controller
Exit();
}
- if (IsActive)
+ if (IsActive && currentGameState == GameMenuState.Playing)
{
// call mouse handler if game window is active
MouseHandler.updateMouse(graph, camera);
diff --git a/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs b/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
index 1dfd8a1..355576b 100644
--- a/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
+++ b/src/Blaze-Brigade/Blaze_Brigade/MouseHandler.cs
@@ -150,7 +150,7 @@ namespace Controller
}
else
{
- GameFunction.deselectUnit(); // if user clicks on invalid end node, deselect it
+ return; // if user clicks on invalid end node, do nothing
}
}
@@ -164,10 +164,10 @@ namespace Controller
GameState.unitToAttack = unit; // set state of attacked unit
GameState.attackConfirmOpen = true; // opens attack confirmation
}
- // deselects the unit if no enemy unit is clicked
else
{
- GameFunction.deselectUnit();
+ GameState.attackSelect = true;
+ return; // does nothing if no enemy unit is clicked
}
}
}
--
GitLab