summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/rustanddust/game
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2016-01-11 10:37:38 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2016-01-11 11:45:57 +0100
commit432fb6f91d186dd7dad12982d24aa66a4ae80ec0 (patch)
tree015163fd9b71898d0f659f4ed7f385f7c25841e5 /core/src/ch/asynk/rustanddust/game
parent21af522854d1b10289e6c338be0663132afe5ba6 (diff)
downloadRustAndDust-432fb6f91d186dd7dad12982d24aa66a4ae80ec0.zip
RustAndDust-432fb6f91d186dd7dad12982d24aa66a4ae80ec0.tar.gz
ArrayListIt -> IterableArray
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game')
-rw-r--r--core/src/ch/asynk/rustanddust/game/Engagement.java4
-rw-r--r--core/src/ch/asynk/rustanddust/game/UnitList.java4
-rw-r--r--core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java6
3 files changed, 7 insertions, 7 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Engagement.java b/core/src/ch/asynk/rustanddust/game/Engagement.java
index 858792e..937739e 100644
--- a/core/src/ch/asynk/rustanddust/game/Engagement.java
+++ b/core/src/ch/asynk/rustanddust/game/Engagement.java
@@ -6,7 +6,7 @@ import java.util.Random;
import com.badlogic.gdx.utils.Pool;
import com.badlogic.gdx.utils.Disposable;
-import ch.asynk.rustanddust.engine.util.ArrayListIt;
+import ch.asynk.rustanddust.engine.util.IterableArray;
public class Engagement implements Disposable, Pool.Poolable
{
@@ -52,7 +52,7 @@ public class Engagement implements Disposable, Pool.Poolable
public Engagement()
{
- assists = new ArrayListIt<Unit>(10);
+ assists = new IterableArray<Unit>(10);
reset();
}
diff --git a/core/src/ch/asynk/rustanddust/game/UnitList.java b/core/src/ch/asynk/rustanddust/game/UnitList.java
index 834dd98..fde9a5c 100644
--- a/core/src/ch/asynk/rustanddust/game/UnitList.java
+++ b/core/src/ch/asynk/rustanddust/game/UnitList.java
@@ -1,11 +1,11 @@
package ch.asynk.rustanddust.game;
import java.util.Collection;
-import ch.asynk.rustanddust.engine.util.ArrayListIt;
+import ch.asynk.rustanddust.engine.util.IterableArray;
import ch.asynk.rustanddust.engine.Pawn;
-public class UnitList extends ArrayListIt<Unit>
+public class UnitList extends IterableArray<Unit>
{
public UnitList(int n)
{
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
index 7b7904d..5023d5a 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
@@ -14,7 +14,7 @@ import ch.asynk.rustanddust.game.Unit.UnitId;
import ch.asynk.rustanddust.game.Factory;
import ch.asynk.rustanddust.game.State.StateType;
import ch.asynk.rustanddust.engine.Orientation;
-import ch.asynk.rustanddust.engine.util.ArrayListIt;
+import ch.asynk.rustanddust.engine.util.IterableArray;
public abstract class BattleCommon implements Battle
{
@@ -28,8 +28,8 @@ public abstract class BattleCommon implements Battle
protected Player currentPlayer;
protected Player usPlayer;
protected Player gePlayer;
- protected ArrayListIt<Zone> entryZone = new ArrayListIt<Zone>();
- protected ArrayListIt<Zone> exitZone = new ArrayListIt<Zone>();
+ protected IterableArray<Zone> entryZone = new IterableArray<Zone>();
+ protected IterableArray<Zone> exitZone = new IterableArray<Zone>();
protected HashMap<Unit, Zone> unitEntry = new HashMap<Unit, Zone>();
protected HashMap<Unit, Zone> unitExit = new HashMap<Unit, Zone>();