summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/tankontank/game
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-11-14 11:55:19 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-11-14 11:55:19 +0100
commit0db00a19dd5c077670590f5a5296895c92358d68 (patch)
tree44c4c2244b2b3a77fcdfa908a8c99891a7cf5f0a /core/src/ch/asynk/tankontank/game
parentcd81f698fc921dcaa36b77658135e11895668b31 (diff)
downloadRustAndDust-0db00a19dd5c077670590f5a5296895c92358d68.zip
RustAndDust-0db00a19dd5c077670590f5a5296895c92358d68.tar.gz
StateCommon: hide/showPossibleTargetsMovesAssists() -> hide/showPossibilities()
Diffstat (limited to 'core/src/ch/asynk/tankontank/game')
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateCommon.java4
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateSelect.java8
2 files changed, 6 insertions, 6 deletions
diff --git a/core/src/ch/asynk/tankontank/game/states/StateCommon.java b/core/src/ch/asynk/tankontank/game/states/StateCommon.java
index 402bd50..7c71a9a 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateCommon.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateCommon.java
@@ -61,14 +61,14 @@ public abstract class StateCommon implements State
TankOnTank.debug(" select " + selectedHex + selectedUnit + (isEnemy ? " enemy " : " friend "));
}
- protected void showPossibleTargetsMovesAssists(Unit pawn)
+ protected void showPossibilities(Unit pawn)
{
if (ctrl.cfg.showMoves && pawn.canMove()) map.showPossibleMoves();
if (ctrl.cfg.showTargets && pawn.canAttack()) map.showPossibleTargets();
if (ctrl.cfg.showMoveAssists && pawn.canMove()) map.showMoveablePawns();
}
- protected void hidePossibleTargetsMovesAssists()
+ protected void hidePossibilities()
{
map.hidePossibleMoves();
map.hidePossibleTargets();
diff --git a/core/src/ch/asynk/tankontank/game/states/StateSelect.java b/core/src/ch/asynk/tankontank/game/states/StateSelect.java
index 298c512..1fe1aa1 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateSelect.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateSelect.java
@@ -24,7 +24,7 @@ public class StateSelect extends StateCommon
@Override
public void leave(StateType nextState)
{
- hidePossibleTargetsMovesAssists();
+ hidePossibilities();
}
@Override
@@ -53,7 +53,7 @@ public class StateSelect extends StateCommon
}
selectHexAndUnit(upHex);
- hidePossibleTargetsMovesAssists();
+ hidePossibilities();
if (hasUnit() && (!isEnemy || ctrl.cfg.showEnemyPossibilities)) {
// moves and targets == 0 if selectedUnit can't be activated for
@@ -65,7 +65,7 @@ public class StateSelect extends StateCommon
targets = map.collectPossibleTargets(selectedUnit, ctrl.opponent.unitIterator());
if (moves > 0)
map.collectMoveablePawns(selectedUnit);
- showPossibleTargetsMovesAssists(selectedUnit);
+ showPossibilities(selectedUnit);
ctrl.hud.actionButtons.show(
((ctrl.player.canPromote(selectedUnit)) ? Buttons.PROMOTE.b : 0 ) |
((selectedUnit.canMove()) ? Buttons.ROTATE.b : 0 ) |
@@ -84,7 +84,7 @@ public class StateSelect extends StateCommon
{
if (selectedHex != null)
map.unselectHex(selectedHex);
- hidePossibleTargetsMovesAssists();
+ hidePossibilities();
map.clearAll();
return StateType.ABORT;
}