summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-02-19 15:00:18 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-02-19 15:00:18 +0100
commit48f89c3783c2a08fcc0bbce88f06421dd93344de (patch)
tree9ecabf0cdcc348e66de8d947cad9e95ff7bbda54
parent7804deadfeb3ffe21938df1b2d23ba5bbf4652b3 (diff)
downloadRustAndDust-48f89c3783c2a08fcc0bbce88f06421dd93344de.zip
RustAndDust-48f89c3783c2a08fcc0bbce88f06421dd93344de.tar.gz
StateDeployment: fix entryZone null, do nothing if rotation -> Orientation.KEEP
-rw-r--r--TODO1
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateDeployment.java5
2 files changed, 2 insertions, 4 deletions
diff --git a/TODO b/TODO
index 32c5916..39baa63 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 63a2087..91b5bd5 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();