summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-01-18 22:04:38 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-01-18 22:04:38 +0100
commitc8ed4e30b06b4d85cc9a0a2d80c08a40c61a6697 (patch)
treec92e011f294debf14b3161360d2eb4a393d757e6 /core
parent5dd4f73ac19d1455abdd3a0043d8fbcd0d585a4c (diff)
downloadRustAndDust-c8ed4e30b06b4d85cc9a0a2d80c08a40c61a6697.zip
RustAndDust-c8ed4e30b06b4d85cc9a0a2d80c08a40c61a6697.tar.gz
Map: leaveBoard -> exitBoard
Diffstat (limited to 'core')
-rw-r--r--core/src/ch/asynk/tankontank/game/Map.java2
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateDeployment.java2
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateEscape.java2
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateMove.java2
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateRotate.java2
5 files changed, 5 insertions, 5 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java
index f32b8d2..066de97 100644
--- a/core/src/ch/asynk/tankontank/game/Map.java
+++ b/core/src/ch/asynk/tankontank/game/Map.java
@@ -293,7 +293,7 @@ public abstract class Map extends Board
return true;
}
- public void leaveBoard(Unit unit)
+ public void exitBoard(Unit unit)
{
Hex hex = unit.getHex();
if (unit.justEntered()) {
diff --git a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
index 1358372..24e8b12 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
@@ -89,7 +89,7 @@ public class StateDeployment extends StateCommon
{
map.unselectHex(selectedHex);
map.hideDirections(selectedHex);
- map.leaveBoard(selectedUnit);
+ map.exitBoard(selectedUnit);
ctrl.player.revertUnitEntry(selectedUnit);
activeUnit = null;
selectedUnit = null;
diff --git a/core/src/ch/asynk/tankontank/game/states/StateEscape.java b/core/src/ch/asynk/tankontank/game/states/StateEscape.java
index b572bc1..c6a0cf4 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateEscape.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateEscape.java
@@ -60,7 +60,7 @@ public class StateEscape extends StateCommon
map.hidePossibleMoves();
map.unselectHex(unit.getHex());
- map.leaveBoard(unit);
+ map.exitBoard(unit);
ctrl.player.unitEscape(unit);
if (map.moveUnit(activeUnit) > 0)
diff --git a/core/src/ch/asynk/tankontank/game/states/StateMove.java b/core/src/ch/asynk/tankontank/game/states/StateMove.java
index 0ed1b2a..c56971c 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateMove.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateMove.java
@@ -70,7 +70,7 @@ public class StateMove extends StateCommon
{
hideAssists();
if (activeUnit.justEntered()) {
- map.leaveBoard(activeUnit);
+ map.exitBoard(activeUnit);
ctrl.player.revertUnitEntry(activeUnit);
return StateType.ABORT;
}
diff --git a/core/src/ch/asynk/tankontank/game/states/StateRotate.java b/core/src/ch/asynk/tankontank/game/states/StateRotate.java
index 2b45512..c282733 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateRotate.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateRotate.java
@@ -55,7 +55,7 @@ public class StateRotate extends StateCommon
StateType nextState = StateType.ABORT;
ctrl.hud.actionButtons.hide();
if (activeUnit.justEntered()) {
- map.leaveBoard(activeUnit);
+ map.exitBoard(activeUnit);
ctrl.player.revertUnitEntry(activeUnit);
nextState = StateType.ABORT;
} else if (map.activatedUnits.size() == 0) {