1 files changed, 9 insertions, 2 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
index e7bcac5..ed6f52f 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
@@ -13,6 +13,7 @@ import ch.asynk.rustanddust.game.Map;
 import ch.asynk.rustanddust.game.Zone;
 import ch.asynk.rustanddust.game.Unit;
 import ch.asynk.rustanddust.game.Unit.UnitCode;
+import ch.asynk.rustanddust.game.Order;
 import ch.asynk.rustanddust.game.Factory;
 import ch.asynk.rustanddust.game.State.StateType;
 import ch.asynk.rustanddust.engine.Orientation;
@@ -104,9 +105,12 @@ public abstract class BattleCommon implements Battle
     {
         map.load(mode, value);
         if((mode == Marshal.Mode.FULL) || (mode == Marshal.Mode.STATE)) {
+            map.loadPlayers(value, players);
             JsonValue v = value.get("battle");
             this.turnCount = v.getInt("turnCount");
-            map.loadPlayers(value, players);
+            Unit.unitId = v.getInt("unitId");
+            Order.orderId = v.getInt("orderId");
+            System.err.println(Unit.unitId);
         }
         this.currentPlayer = players[0];
     }
@@ -118,6 +122,8 @@ public abstract class BattleCommon implements Battle
         if((mode == Marshal.Mode.FULL) || (mode == Marshal.Mode.STATE)) {
             json.writeObjectStart("battle");
             json.writeValue("turnCount", turnCount);
+            json.writeValue("unitId", Unit.unitId);
+            json.writeValue("orderId", Order.orderId);
             json.writeObjectEnd();
             map.unloadPlayers(json, getPlayer(), getOpponent());
         }
@@ -260,7 +266,8 @@ public abstract class BattleCommon implements Battle
     {
         Unit unit = factory.getUnit(unitCode, hq, ace);
         if (exitZone != null) unit.exitZone = exitZone;
-        map.setOnBoard(unit, map.getHex(col, row), orientation);
+        // map.setOnBoard(unit, map.getHex(col, row), orientation);
+        map.execute(map.getSetOrder(unit, map.getHex(col, row), orientation));
         return unit;
     }
 }