2 files changed, 5 insertions, 5 deletions
diff --git a/core/src/ch/asynk/tankontank/game/states/StateAttack.java b/core/src/ch/asynk/tankontank/game/states/StateAttack.java
index c8b104c..7c4d6b2 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateAttack.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateAttack.java
@@ -54,7 +54,7 @@ public class StateAttack extends StateCommon
             to.set(upHex);
             activePawn = map.getTopPawnAt(to);
             map.showTarget(to, true);
-            map.buildAttack(selectedPawn, activePawn, to, ctrl.currentPlayer.unitIterator());
+            map.buildAttackAssists(selectedPawn, activePawn, to, ctrl.currentPlayer().unitIterator());
             map.showAttackAssists(true);
             ctrl.hud.show(false, false, true, true, ctrl.cfg.canCancel);
         }
@@ -79,12 +79,12 @@ public class StateAttack extends StateCommon
     @Override
     public void done()
     {
-        int d1 = ctrl.currentPlayer.d6();
-        int d2 = ctrl.currentPlayer.d6();
+        int d1 = ctrl.currentPlayer().d6();
+        int d2 = ctrl.currentPlayer().d6();
         System.err.print("  attack (" + from.x + ";" + from.y + ") -> (" + to.x + ";" + to.y + ") : 2D6 -> (" + d1 + " + " + d2 + ")");
         if (map.attackPawn(selectedPawn, activePawn, from, to, d1 + d2)) {
             map.removePawnFrom(activePawn, to);
-            ctrl.currentPlayer.casualty(activePawn);
+            ctrl.currentPlayer().casualty(activePawn);
             // TODO free move for infantry
         }
 
diff --git a/core/src/ch/asynk/tankontank/game/states/StateCommon.java b/core/src/ch/asynk/tankontank/game/states/StateCommon.java
index 86b8838..df4dc56 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateCommon.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateCommon.java
@@ -110,7 +110,7 @@ public abstract class StateCommon implements State
         selectedPawn = map.getTopPawnAt(selectedHex);
         map.selectHex(selectedHex);
         if (selectedPawn != null)
-            isEnemy = ctrl.currentPlayer.isEnemy(selectedPawn);
+            isEnemy = ctrl.currentPlayer().isEnemy(selectedPawn);
         else
             isEnemy = false;
         System.err.println("  select (" + selectedHex.x + ";" + selectedHex.y + ") "  + selectedPawn + (isEnemy ? " enemy " : " friend "));