StateDeployment: show Unit on board, emit the real move after rotation selection

1 files changed, 6 insertions, 3 deletions

diff --git a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
index 3fd9aa5..9fb9a7e 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
@@ -101,7 +101,7 @@ public class StateDeployment extends StateCommon
     {
         selectedUnit = unit;
         selectedHex = upHex;
-        map.setOnBoard(unit, upHex, entryZone.orientation);
+        map.showOnBoard(unit, upHex, entryZone.orientation);
         deployedUnits.add(unit);
         entryZone.enable(Hex.AREA, false);
         showRotation(unit, upHex);
@@ -122,8 +122,11 @@ public class StateDeployment extends StateCommon
     {
         map.unselectHex(selectedHex);
         map.hideDirections(selectedHex);
-        if (o != Orientation.KEEP)
-            selectedUnit.setRotation(o.r());
+
+        if (o == Orientation.KEEP)
+            o = entryZone.orientation;
+        map.setOnBoard(selectedUnit, selectedHex, o);
+
         ctrl.hud.actionButtons.hide();
         ctrl.hud.playerInfo.unitDock.show();
         entryZone = null;