From bece4c3445320246eb19a22a96337728a54311c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 9 Dec 2015 01:14:34 +0100 Subject: Battle: deploymentDone() -> isDeploymentDone() --- core/src/ch/asynk/rustanddust/game/Battle.java | 2 +- core/src/ch/asynk/rustanddust/game/Ctrl.java | 2 +- core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java | 2 +- 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(); } -- cgit v1.1-2-g2b99