From 2d9c55c5a48319c9a826082b755859b1b472706d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Tue, 1 Dec 2015 16:20:45 +0100 Subject: Map: clear activatedUnits in case of ATG only attack after having launched the animations --- core/src/ch/asynk/rustanddust/game/Map.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/ch/asynk/rustanddust/game/Map.java b/core/src/ch/asynk/rustanddust/game/Map.java index ade2ceb..5ce653e 100644 --- a/core/src/ch/asynk/rustanddust/game/Map.java +++ b/core/src/ch/asynk/rustanddust/game/Map.java @@ -567,13 +567,13 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS addAnimation(destroy); } + ctrl.hud.engagementSummary(e, ctrl.cfg.fxVolume); + addEngagementAnimation(e.defender); + // do not consume action points if ((activatedUnits.size() == 1) && e.attacker.isA(Unit.UnitType.AT_GUN) && e.defender.isHardTarget()) activatedUnits.clear(); - ctrl.hud.engagementSummary(e, ctrl.cfg.fxVolume); - addEngagementAnimation(e.defender); - return (e.success ? 1 : 0); } -- cgit v1.1-2-g2b99