summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-12-19 09:33:11 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-12-19 09:33:11 +0100
commit1c4157758f7748b9522e64ebaa2ca0fd09b31a72 (patch)
tree526dc625bc903f5b01571bafc4311ca1e5f515b2
parent153833bd24fd0a284f37d0eb26a728e245fa2df5 (diff)
downloadRustAndDust-1c4157758f7748b9522e64ebaa2ca0fd09b31a72.zip
RustAndDust-1c4157758f7748b9522e64ebaa2ca0fd09b31a72.tar.gz
StateDeployment: done -> completed
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateDeployment.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
index 8632e23..2cc7743 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
@@ -11,7 +11,7 @@ import ch.asynk.tankontank.TankOnTank;
public class StateDeployment extends StateCommon
{
- private boolean done;
+ private boolean completed;
private Zone entryZone;
private UnitList deployedUnits = new UnitList(10);
@@ -20,7 +20,7 @@ public class StateDeployment extends StateCommon
{
if (selectedHex != null)
map.unselectHex(selectedHex);
- done = false;
+ completed = false;
entryZone = null;
selectedHex = null;
ctrl.hud.actionButtons.hide();
@@ -63,11 +63,11 @@ public class StateDeployment extends StateCommon
public void touchUp()
{
Unit unit = ctrl.hud.playerInfo.unitDock.selectedUnit;
- if (!done && (unit != null) && (unit != activeUnit)) {
+ if (!completed && (unit != null) && (unit != activeUnit)) {
showEntryZone(unit);
} else if (selectedUnit != null) {
doRotation(Orientation.fromAdj(selectedHex, upHex));
- } else if (!done && (entryZone != null) && (upHex != null)) {
+ } else if (!completed && (entryZone != null) && (upHex != null)) {
if (upHex.isEmpty() && entryZone.contains(upHex))
unitEnter(activeUnit);
} else {
@@ -130,7 +130,7 @@ public class StateDeployment extends StateCommon
activeUnit = null;
selectedUnit = null;
if (ctrl.checkDeploymentDone()) {
- done = true;
+ completed = true;
ctrl.hud.actionButtons.show(Buttons.DONE.b);
}
}