summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-11-21 14:11:35 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-11-21 14:11:35 +0100
commit03cb6cd1d5b84ae6650fd4749705361d35914688 (patch)
treeef84b76ee1aeb3f33532a350c5be993adbfaca37 /core
parenta351a4cb36b352c70604bb44a006735029b2021e (diff)
downloadRustAndDust-03cb6cd1d5b84ae6650fd4749705361d35914688.zip
RustAndDust-03cb6cd1d5b84ae6650fd4749705361d35914688.tar.gz
Army: reorder code
Diffstat (limited to 'core')
-rw-r--r--core/src/ch/asynk/tankontank/game/Army.java8
1 files 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);
}
}