summaryrefslogtreecommitdiffstats
path: root/core/src
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2016-02-02 14:56:56 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2016-02-02 14:56:56 +0100
commit5022010f5d728820372839aff7eb461b112580d6 (patch)
treebbd8f09705619167941fe6a2168c080a5ed4f568 /core/src
parentc49aaeaabd83e085e23ef0eca169ce804cf78ab4 (diff)
downloadRustAndDust-5022010f5d728820372839aff7eb461b112580d6.zip
RustAndDust-5022010f5d728820372839aff7eb461b112580d6.tar.gz
Engagement: use UnitList instead of Collection<Unit>
Diffstat (limited to 'core/src')
-rw-r--r--core/src/ch/asynk/rustanddust/game/Engagement.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Engagement.java b/core/src/ch/asynk/rustanddust/game/Engagement.java
index 2d3bd24..c139f4b 100644
--- a/core/src/ch/asynk/rustanddust/game/Engagement.java
+++ b/core/src/ch/asynk/rustanddust/game/Engagement.java
@@ -5,7 +5,6 @@ import java.util.Random;
import com.badlogic.gdx.utils.Pool;
import com.badlogic.gdx.utils.Disposable;
-import ch.asynk.rustanddust.engine.util.Collection;
import ch.asynk.rustanddust.engine.util.IterableArray;
public class Engagement implements Disposable, Pool.Poolable
@@ -36,7 +35,7 @@ public class Engagement implements Disposable, Pool.Poolable
public Unit attacker;
public Unit defender;
- public Collection<Unit> assists;
+ public UnitList assists;
public boolean success;
public int d1;
public int d2;
@@ -52,7 +51,7 @@ public class Engagement implements Disposable, Pool.Poolable
public Engagement()
{
- assists = new IterableArray<Unit>(10);
+ assists = new UnitList(10);
reset();
}