diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-17 14:52:51 +0100 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-17 14:52:51 +0100 |
commit | 8d6f8738203d45d4da116e390b6e6685f4636bb3 (patch) | |
tree | cc78b335fcbf9f805f419d9f7aa33284b3c3b815 /core/src/ch/asynk/tankontank/engine/Board.java | |
parent | b4c82404bcb7b2e1f58339088ccf48023c1da6f9 (diff) | |
download | RustAndDust-8d6f8738203d45d4da116e390b6e6685f4636bb3.zip RustAndDust-8d6f8738203d45d4da116e390b6e6685f4636bb3.tar.gz |
Player: clean up API
Diffstat (limited to 'core/src/ch/asynk/tankontank/engine/Board.java')
-rw-r--r-- | core/src/ch/asynk/tankontank/engine/Board.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/core/src/ch/asynk/tankontank/engine/Board.java b/core/src/ch/asynk/tankontank/engine/Board.java index 203436c..a7ebabf 100644 --- a/core/src/ch/asynk/tankontank/engine/Board.java +++ b/core/src/ch/asynk/tankontank/engine/Board.java @@ -1,5 +1,6 @@ package ch.asynk.tankontank.engine; +import java.util.List; import java.util.Iterator; import java.util.Collection; import java.util.ArrayList; @@ -302,11 +303,10 @@ public abstract class Board implements Disposable return searchBoard.possibleTargetsFrom(pawn, targets); } - protected int collectPossibleTargets(Pawn pawn, Iterator<Pawn> units, PawnCollection targets) + protected int collectPossibleTargets(Pawn pawn, List<Pawn> units, PawnCollection targets) { targets.clear(); - while (units.hasNext()) { - Pawn target = units.next(); + for (Pawn target : units) { if (pawn.canEngage(target) && searchBoard.collectAttacks(pawn, target, true)) targets.add(target); } @@ -332,11 +332,10 @@ public abstract class Board implements Disposable return assists.size(); } - protected int collectAttackAssists(Pawn pawn, Pawn target, Iterator<Pawn> units, PawnCollection assists) + protected int collectAttackAssists(Pawn pawn, Pawn target, List<Pawn> units, PawnCollection assists) { assists.clear(); - while (units.hasNext()) { - Pawn p = units.next(); + for (Pawn p : units) { if ((p != pawn) && p.canEngage(target) && searchBoard.collectAttacks(p, target, !p.canAssistEngagementWithoutLos())) assists.add(p); } |