summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/rustanddust
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-12-09 01:14:34 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-12-09 01:14:34 +0100
commitbece4c3445320246eb19a22a96337728a54311c0 (patch)
tree3292f8dd873b6af6820edf1d2759f05109da104c /core/src/ch/asynk/rustanddust
parent6dd260c8130ff79a97ff3aa2fcea38441808188d (diff)
downloadRustAndDust-bece4c3445320246eb19a22a96337728a54311c0.zip
RustAndDust-bece4c3445320246eb19a22a96337728a54311c0.tar.gz
Battle: deploymentDone() -> isDeploymentDone()
Diffstat (limited to 'core/src/ch/asynk/rustanddust')
-rw-r--r--core/src/ch/asynk/rustanddust/game/Battle.java2
-rw-r--r--core/src/ch/asynk/rustanddust/game/Ctrl.java2
-rw-r--r--core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Battle.java b/core/src/ch/asynk/rustanddust/game/Battle.java
index 27a5079..3922ce0 100644
--- a/core/src/ch/asynk/rustanddust/game/Battle.java
+++ b/core/src/ch/asynk/rustanddust/game/Battle.java
@@ -31,7 +31,7 @@ public interface Battle
public State.StateType getState();
- public boolean deploymentDone();
+ public boolean isDeploymentDone();
public Map setup();
}
diff --git a/core/src/ch/asynk/rustanddust/game/Ctrl.java b/core/src/ch/asynk/rustanddust/game/Ctrl.java
index 2129f22..8259a6c 100644
--- a/core/src/ch/asynk/rustanddust/game/Ctrl.java
+++ b/core/src/ch/asynk/rustanddust/game/Ctrl.java
@@ -268,7 +268,7 @@ public class Ctrl implements Disposable
public boolean checkDeploymentDone()
{
- boolean done = battle.deploymentDone();
+ boolean done = battle.isDeploymentDone();
if (done)
hud.askEndDeployment();
return done;
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
index b1c5192..13edd7c 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
@@ -99,7 +99,7 @@ public abstract class BattleCommon implements Battle
}
@Override
- public boolean deploymentDone()
+ public boolean isDeploymentDone()
{
return currentPlayer.isDeploymentDone();
}