Battle: no need of Player parameter anymore

2 files changed, 6 insertions, 6 deletions

diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
index 112deaf..4585fdd 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
@@ -93,15 +93,15 @@ public abstract class BattleCommon implements Battle
     }
 
     @Override
-    public boolean deploymentDone(Player player)
+    public boolean deploymentDone()
     {
-        return player.isDeploymentDone();
+        return currentPlayer.isDeploymentDone();
     }
 
     @Override
-    public StateType getState(Player player)
+    public StateType getState()
     {
-        if (!player.isDeploymentDone())
+        if (!currentPlayer.isDeploymentDone())
             return StateType.DEPLOYMENT;
         return StateType.SELECT;
     }
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
index 348e20a..df3ff2a 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
@@ -24,9 +24,9 @@ public class BattleTest extends BattleCommon
     }
 
     @Override
-    public Position getHudPosition(Player player)
+    public Position getHudPosition()
     {
-        return (player.is(Army.US) ? Position.TOP_RIGHT: Position.TOP_LEFT);
+        return (currentPlayer.is(Army.US) ? Position.TOP_RIGHT: Position.TOP_LEFT);
     }
 
     @Override