Battle: remove unused parameters and imports

2 files changed, 7 insertions, 12 deletions

diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
index 9292095..10534c8 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
@@ -7,11 +7,9 @@ import java.util.ArrayList;
 import ch.asynk.rustanddust.game.Army;
 import ch.asynk.rustanddust.game.Battle;
 import ch.asynk.rustanddust.game.Player;
-import ch.asynk.rustanddust.game.Ctrl;
 import ch.asynk.rustanddust.game.Map;
 import ch.asynk.rustanddust.game.Zone;
 import ch.asynk.rustanddust.game.Hex;
-import ch.asynk.rustanddust.game.HexSet;
 import ch.asynk.rustanddust.game.Unit;
 import ch.asynk.rustanddust.game.Unit.UnitId;
 import ch.asynk.rustanddust.game.State.StateType;
@@ -63,7 +61,7 @@ public abstract class BattleCommon implements Battle
     }
 
     @Override
-    public Map setup(Ctrl ctrl)
+    public Map setup()
     {
         this.map = factory.getMap(mapType);
         this.usPlayer = factory.getPlayer(Army.US);
@@ -105,7 +103,7 @@ public abstract class BattleCommon implements Battle
     }
 
     @Override
-    public boolean getReinforcement(Ctrl ctrl)
+    public boolean hasReinforcement()
     {
         return false;
     }
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
index 1532efd..b9b6333 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
@@ -2,10 +2,7 @@ package ch.asynk.rustanddust.game.battles;
 
 import ch.asynk.rustanddust.game.Army;
 import ch.asynk.rustanddust.game.Player;
-import ch.asynk.rustanddust.game.Ctrl;
 import ch.asynk.rustanddust.game.Map;
-import ch.asynk.rustanddust.game.Hex;
-import ch.asynk.rustanddust.game.HexSet;
 import ch.asynk.rustanddust.game.Zone;
 import ch.asynk.rustanddust.game.Unit;
 import ch.asynk.rustanddust.game.Unit.UnitId;
@@ -30,15 +27,15 @@ public class BattleTest extends BattleCommon
     }
 
     @Override
-    public Player checkVictory(Ctrl ctrl)
+    public Player getVictor()
     {
         if (usPlayer.getTurnDone() > 2)
-                return usPlayer;
+            return usPlayer;
         return null;
     }
 
     @Override
-    public boolean getReinforcement(Ctrl ctrl)
+    public boolean hasReinforcement()
     {
         if (currentPlayer.is(Army.GE))
             return false;
@@ -55,9 +52,9 @@ public class BattleTest extends BattleCommon
     }
 
     @Override
-    public Map setup(Ctrl ctrl)
+    public Map setup()
     {
-        super.setup(ctrl);
+        super.setup();
 
         map.addObjective(5, 2, Army.NONE);
         map.addHoldObjective(5, 3, Army.NONE);