From 48f89c3783c2a08fcc0bbce88f06421dd93344de Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Thu, 19 Feb 2015 15:00:18 +0100 Subject: StateDeployment: fix entryZone null, do nothing if rotation -> Orientation.KEEP --- TODO | 1 - core/src/ch/asynk/tankontank/game/states/StateDeployment.java | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/TODO b/TODO index 32c5916d..39baa635 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,4 @@ BUGS: - - deployment select for rotation, click on another unit : entryZone is null !! - unitDock click issues - possible to select units before the end of engagement animation diff --git a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java index 63a2087d..91b5bd5a 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java +++ b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java @@ -124,9 +124,8 @@ public class StateDeployment extends StateCommon map.unselectHex(selectedHex); map.hideDirections(selectedHex); - if (o == Orientation.KEEP) - o = entryZone.orientation; - map.setOnBoard(selectedUnit, selectedHex, o); + if (o != Orientation.KEEP) + map.setOnBoard(selectedUnit, selectedHex, o); ctrl.hud.actionButtons.hide(); ctrl.hud.playerInfo.unitDock.show(); -- cgit v1.2.3