From 16e2a507c80f296a17e1fcefb6f29bcbdc81222d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Thu, 30 Oct 2014 13:39:48 +0100
Subject: Pawn: remove boolean canBeAttacked(Pawn) -> use boolean
 canAttack(Pawn)

---
 core/src/ch/asynk/tankontank/engine/Board.java | 2 +-
 core/src/ch/asynk/tankontank/engine/Pawn.java  | 1 -
 core/src/ch/asynk/tankontank/game/Unit.java    | 6 ------
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/core/src/ch/asynk/tankontank/engine/Board.java b/core/src/ch/asynk/tankontank/engine/Board.java
index 1eb68dd..42b8f23 100644
--- a/core/src/ch/asynk/tankontank/engine/Board.java
+++ b/core/src/ch/asynk/tankontank/engine/Board.java
@@ -275,7 +275,7 @@ public abstract class Board implements Disposable
         targets.clear();
         while (units.hasNext()) {
             Pawn target = units.next();
-            if (!target.canBeAttacked(pawn)) continue;
+            if (!pawn.canAttack(target)) continue;
             Tile to = target.getTile();
             if (searchBoard.collectAttack(pawn, true, target, from.getCol(), from.getRow(), to.getCol(), to.getRow()))
                 targets.add(target);
diff --git a/core/src/ch/asynk/tankontank/engine/Pawn.java b/core/src/ch/asynk/tankontank/engine/Pawn.java
index 42a4083..db54f36 100644
--- a/core/src/ch/asynk/tankontank/engine/Pawn.java
+++ b/core/src/ch/asynk/tankontank/engine/Pawn.java
@@ -62,7 +62,6 @@ public abstract class Pawn implements Moveable, Disposable
     public abstract boolean canRotate();
     public abstract boolean canAttack();
     public abstract boolean canAttack(Pawn other);
-    public abstract boolean canBeAttacked(Pawn other);
     public abstract boolean canAssistAttackWithoutLos();
 
     public abstract void move(int cost);
diff --git a/core/src/ch/asynk/tankontank/game/Unit.java b/core/src/ch/asynk/tankontank/game/Unit.java
index 5670c1b..71182a2 100644
--- a/core/src/ch/asynk/tankontank/game/Unit.java
+++ b/core/src/ch/asynk/tankontank/game/Unit.java
@@ -195,12 +195,6 @@ public class Unit extends HeadedPawn
     }
 
     @Override
-    public boolean canBeAttacked(Pawn other)
-    {
-        return true;
-    }
-
-    @Override
     public void rotate(Orientation o)
     {
         hasMoved = true;
-- 
cgit v1.1-2-g2b99