From 0d21b8a92b1df2b8765cc1802e0b8c7f48cd4745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Sun, 24 Jan 2016 19:31:05 +0100
Subject: Battles: use add(int, int) instead of add(map.getHex(int, int))

---
 .../asynk/rustanddust/game/battles/Battle00.java   | 36 +++++++++++-----------
 .../asynk/rustanddust/game/battles/BattleTest.java | 14 ++++-----
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/core/src/ch/asynk/rustanddust/game/battles/Battle00.java b/core/src/ch/asynk/rustanddust/game/battles/Battle00.java
index 411b6aa..335ee57 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/Battle00.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/Battle00.java
@@ -66,16 +66,16 @@ public class Battle00 extends BattleCommon
 
         Zone usEntry = new Zone(map, 10);
         usEntry.orientation = Orientation.SOUTH;
-        usEntry.add(map.getHex(8, 0));
-        usEntry.add(map.getHex(9, 0));
-        usEntry.add(map.getHex(8, 1));
-        usEntry.add(map.getHex(9, 1));
-        usEntry.add(map.getHex(9, 2));
-        usEntry.add(map.getHex(10, 2));
-        usEntry.add(map.getHex(9, 3));
-        usEntry.add(map.getHex(10, 3));
-        usEntry.add(map.getHex(10, 4));
-        usEntry.add(map.getHex(11, 4));
+        usEntry.add(8, 0);
+        usEntry.add(9, 0);
+        usEntry.add(8, 1);
+        usEntry.add(9, 1);
+        usEntry.add(9, 2);
+        usEntry.add(10, 2);
+        usEntry.add(9, 3);
+        usEntry.add(10, 3);
+        usEntry.add(10, 4);
+        usEntry.add(11, 4);
         addEntryZone(usEntry);
         addReinforcement(usPlayer, usEntry, UnitId.US_SHERMAN, true, false);
         addReinforcement(usPlayer, usEntry, UnitId.US_SHERMAN);
@@ -88,14 +88,14 @@ public class Battle00 extends BattleCommon
 
         Zone geEntry = new Zone(map, 8);
         geEntry.orientation = Orientation.NORTH;
-        geEntry.add(map.getHex(4, 8));
-        geEntry.add(map.getHex(5, 8));
-        geEntry.add(map.getHex(4, 7));
-        geEntry.add(map.getHex(5, 7));
-        geEntry.add(map.getHex(3, 6));
-        geEntry.add(map.getHex(4, 6));
-        geEntry.add(map.getHex(3, 5));
-        geEntry.add(map.getHex(4, 5));
+        geEntry.add(4, 8);
+        geEntry.add(5, 8);
+        geEntry.add(4, 7);
+        geEntry.add(5, 7);
+        geEntry.add(3, 6);
+        geEntry.add(4, 6);
+        geEntry.add(3, 5);
+        geEntry.add(4, 5);
         addEntryZone(geEntry);
         addReinforcement(gePlayer, geEntry, UnitId.GE_PANZER_IV, true, false);
         addReinforcement(gePlayer, geEntry, UnitId.GE_PANZER_IV);
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
index 6daf61a..11af25e 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
@@ -80,19 +80,19 @@ public class BattleTest extends BattleCommon
 
         Zone geEntry = new Zone(map, 6);
         geEntry.orientation = Orientation.NORTH;
-        geEntry.add(map.getHex(1, 2));
-        geEntry.add(map.getHex(1, 1));
-        geEntry.add(map.getHex(3, 3));
-        geEntry.add(map.getHex(3, 4));
+        geEntry.add(1, 2);
+        geEntry.add(1, 1);
+        geEntry.add(3, 3);
+        geEntry.add(3, 4);
         addEntryZone(geEntry);
         addReinforcement(gePlayer, geEntry, UnitId.GE_AT_GUN);
 
         currentPlayer = usPlayer;
         usExit = new Zone(map, 9);
         usExit.orientation = Orientation.NORTH;
-        usExit.add(map.getHex(11, 4));
-        usExit.add(map.getHex(11, 5));
-        usExit.add(map.getHex(12, 6));
+        usExit.add(11, 4);
+        usExit.add(11, 5);
+        usExit.add(12, 6);
         addExitZone(usExit);
 
         usPlayer.casualty(factory.getUnit(UnitId.US_SHERMAN, true, false));
-- 
cgit v1.1-2-g2b99