From a2bc92fdff3831991360441009792f065d550f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Tue, 20 Jan 2015 12:27:33 +0100 Subject: StateEngagement: click on attack leader to abort --- core/src/ch/asynk/tankontank/game/states/StateEngage.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/ch/asynk/tankontank/game/states/StateEngage.java b/core/src/ch/asynk/tankontank/game/states/StateEngage.java index c1903bd..048dbef 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateEngage.java +++ b/core/src/ch/asynk/tankontank/game/states/StateEngage.java @@ -79,8 +79,10 @@ public class StateEngage extends StateCommon { Unit unit = upHex.getUnit(); - // activeUnit is the target - if ((activeUnit == null) && map.possibleTargets.contains(unit)) { + // activeUnit is the target, selectedTarget is the engagement leader + if (unit == selectedUnit) { + ctrl.setState(StateType.ABORT); + } else if ((activeUnit == null) && map.possibleTargets.contains(unit)) { // ctrl.hud.notify("Engage " + unit); map.hidePossibleTargets(); to = upHex; -- cgit v1.1-2-g2b99