Ctrl,Battle: Battle manages currentPlayer and opponent

3 files changed, 9 insertions, 9 deletions

diff --git a/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java b/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java
index 7d6bb1e..d34d0dd 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java
@@ -101,7 +101,7 @@ public class StateDeployment extends StateCommon
     {
         selectedUnit = unit;
         selectedHex = upHex;
-        ctrl.player.reinforcement.remove(unit);
+        ctrl.battle.getPlayer().reinforcement.remove(unit);
         map.showOnBoard(unit, upHex, entryZone.orientation);
         deployedUnits.add(unit);
         entryZone.enable(Hex.AREA, false);
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateEngage.java b/core/src/ch/asynk/rustanddust/game/states/StateEngage.java
index 5daf1e8..ab7a126 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateEngage.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateEngage.java
@@ -18,7 +18,7 @@ public class StateEngage extends StateCommon
             activeUnit = null;
             // use selectedHex and selectedUnit
             map.unitsTargetHide();
-            map.collectTargets(selectedUnit, ctrl.opponent.units);
+            map.collectTargets(selectedUnit, ctrl.battle.getOpponent().units);
             map.unitsTargetShow();
             if (to != null) {
                 // quick fire -> replay touchUp
@@ -54,13 +54,13 @@ public class StateEngage extends StateCommon
     {
         StateType nextState = StateType.DONE;
         if (map.engageUnit(selectedUnit, activeUnit)) {
-            ctrl.player.wonEngagementCount += 1;
-            ctrl.opponent.casualty(activeUnit);
+            ctrl.battle.getPlayer().wonEngagementCount += 1;
+            ctrl.battle.getOpponent().casualty(activeUnit);
             if (map.unitsBreakThroughSize() > 0) {
                 nextState = StateType.BREAK;
             }
         } else {
-            ctrl.player.lostEngagementCount += 1;
+            ctrl.battle.getPlayer().lostEngagementCount += 1;
         }
 
         activeUnit.showTarget();
@@ -87,7 +87,7 @@ public class StateEngage extends StateCommon
             to = upHex;
             activeUnit = unit;
             activeUnit.showTarget();
-            map.collectAssists(selectedUnit, activeUnit, ctrl.player.units);
+            map.collectAssists(selectedUnit, activeUnit, ctrl.battle.getPlayer().units);
             map.unitsAssistShow();
             ctrl.hud.actionButtons.show((ctrl.cfg.mustValidate ? Buttons.DONE.b : 0) | (ctrl.cfg.canCancel ? Buttons.ABORT.b : 0));
         }
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateSelect.java b/core/src/ch/asynk/rustanddust/game/states/StateSelect.java
index d7738c4..2d97e40 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateSelect.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateSelect.java
@@ -90,7 +90,7 @@ public class StateSelect extends StateCommon
             return;
         }
 
-        isEnemy = ctrl.player.isEnemy(unit);
+        isEnemy = ctrl.battle.getPlayer().isEnemy(unit);
         if (!isEnemy && (unit == selectedUnit) && unit.canMove()) {
             if (unit.isHq()) {
                 ctrl.hud.notify("HQ activation");
@@ -116,7 +116,7 @@ public class StateSelect extends StateCommon
             return;
 
         int moves = map.movesCollect(selectedUnit);
-        int targets = map.collectTargets(selectedUnit, (isEnemy ? ctrl.player.units : ctrl.opponent.units));
+        int targets = map.collectTargets(selectedUnit, (isEnemy ? ctrl.battle.getPlayer() : ctrl.battle.getOpponent()).units);
 
         if (moves > 0)
             map.collectMoveable(selectedUnit);
@@ -126,7 +126,7 @@ public class StateSelect extends StateCommon
             showPossibilities(selectedUnit);
         }
 
-        ctrl.hud.actionButtons.show((ctrl.player.canPromote(selectedUnit)) ? Buttons.PROMOTE.b : 0 );
+        ctrl.hud.actionButtons.show((ctrl.battle.getPlayer().canPromote(selectedUnit)) ? Buttons.PROMOTE.b : 0 );
         RustAndDust.debug("Select", selectedHex.toString() + " " + selectedUnit + (isEnemy ? " enemy " : " friend "));
     }
 }