Board,Map...: fix findEntryPoint(...)

2 files changed, 7 insertions, 14 deletions

diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java b/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java
index 8d2c5fc..c39b2b4 100644
--- a/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java
+++ b/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java
@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.ArrayList;
 
 import ch.asynk.tankontank.engine.TileSet;
+import ch.asynk.tankontank.engine.EntryPoint;
 import ch.asynk.tankontank.game.Army;
 import ch.asynk.tankontank.game.Battle;
 import ch.asynk.tankontank.game.Player;
@@ -20,8 +21,8 @@ public abstract class BattleCommon implements Battle
     protected Army firstArmy;
     protected Army secondArmy;
     protected Factory factory;
-    protected ArrayList<TileSet> entryPoints = new ArrayList<TileSet>();
-    protected HashMap<Unit, TileSet> pawnEntry = new HashMap<Unit, TileSet>();
+    protected ArrayList<EntryPoint> entryPoints = new ArrayList<EntryPoint>();
+    protected HashMap<Unit, EntryPoint> pawnEntry = new HashMap<Unit, EntryPoint>();
     protected TileSet objectives;
 
     public BattleCommon(Factory factory)
@@ -50,19 +51,19 @@ public abstract class BattleCommon implements Battle
         }
     }
 
-    public void addEntryPoint(TileSet tiles)
+    public void addEntryPoint(EntryPoint entry)
     {
-        entryPoints.add(tiles);
+        entryPoints.add(entry);
     }
 
-    public void addReinforcement(Player player, TileSet entryPoint, UnitId unitId)
+    public void addReinforcement(Player player, EntryPoint entryPoint, UnitId unitId)
     {
         Unit unit = factory.getUnit(unitId);
         player.addReinforcement(unit);
         pawnEntry.put(unit, entryPoint);
     }
 
-    public TileSet getEntryPoint(Unit unit)
+    public EntryPoint getEntryPoint(Unit unit)
     {
         return pawnEntry.get(unit);
     }
diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java b/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java
index ab3e5fb..ae35df2 100644
--- a/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java
+++ b/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java
@@ -79,14 +79,6 @@ public class BattleHeadToHead extends BattleCommon
     }
 
     @Override
-    public Orientation getEntryOrientation(Player player)
-    {
-        if (player.isEnemy(Army.GE))
-            return Orientation.SOUTH;
-        return Orientation.NORTH;
-    }
-
-    @Override
     public void setup(Map map, Player a, Player b)
     {
         Player gePlayer;