From 03cb6cd1d5b84ae6650fd4749705361d35914688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Fri, 21 Nov 2014 14:11:35 +0100 Subject: Army: reorder code --- core/src/ch/asynk/tankontank/game/Army.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/ch/asynk/tankontank/game/Army.java b/core/src/ch/asynk/tankontank/game/Army.java index 108bdb0..7a5454e 100644 --- a/core/src/ch/asynk/tankontank/game/Army.java +++ b/core/src/ch/asynk/tankontank/game/Army.java @@ -17,14 +17,14 @@ public enum Army implements Faction } @Override - public boolean isEnemy(Faction other) + public String toString() { - return (this != other); + return s; } @Override - public String toString() + public boolean isEnemy(Faction other) { - return s; + return (this != other); } } -- cgit v1.1-2-g2b99