From c6b8b7ce0280380cc1aba188b66828f76d0cef27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Thu, 30 Oct 2014 15:34:20 +0100 Subject: Board: clean up int collectAttackAssists(Pawn, Pawn, Iterator, PawnCollection) --- core/src/ch/asynk/tankontank/engine/Board.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/core/src/ch/asynk/tankontank/engine/Board.java b/core/src/ch/asynk/tankontank/engine/Board.java index f3faa01..a33bea0 100644 --- a/core/src/ch/asynk/tankontank/engine/Board.java +++ b/core/src/ch/asynk/tankontank/engine/Board.java @@ -298,15 +298,10 @@ public abstract class Board implements Disposable protected int collectAttackAssists(Pawn pawn, Pawn target, Iterator units, PawnCollection assists) { assists.clear(); - Tile to = target.getTile(); while (units.hasNext()) { Pawn p = units.next(); - if ((p == pawn) || !p.canAttack()) continue; - Tile from = p.getTile(); - if (searchBoard.collectAttack(p, !p.canAssistAttackWithoutLos(), target, from.getCol(), from.getRow(), to.getCol(), to.getRow())) { - if (p != pawn) - assists.add(p); - } + if (p.canAttack(target) && searchBoard.collectAttacks(p, target, !p.canAssistAttackWithoutLos())) + assists.add(p); } return assists.size(); -- cgit v1.1-2-g2b99