summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/tankontank/game/states
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-11-01 17:44:29 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-11-01 17:44:29 +0100
commita381850e22a186722c646315f594096e1e0f5669 (patch)
treefc0941a52138965c09ab33ecb366362309b48a99 /core/src/ch/asynk/tankontank/game/states
parentaa3dc8940c9ec6ac285e6792433d293b8bdd6069 (diff)
downloadRustAndDust-a381850e22a186722c646315f594096e1e0f5669.zip
RustAndDust-a381850e22a186722c646315f594096e1e0f5669.tar.gz
set new Tile overlays and cleanup usage
Diffstat (limited to 'core/src/ch/asynk/tankontank/game/states')
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateMove.java5
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateRotate.java4
2 files changed, 1 insertions, 8 deletions
diff --git a/core/src/ch/asynk/tankontank/game/states/StateMove.java b/core/src/ch/asynk/tankontank/game/states/StateMove.java
index f1e09f8..e2ba7da 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateMove.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateMove.java
@@ -42,7 +42,6 @@ public class StateMove extends StateCommon
map.hidePossibleMoves();
map.unselectHex(activeUnit.getHex());
if (to != null) {
- map.unselectHex(to);
map.hideFinalPath(to);
}
@@ -99,7 +98,6 @@ public class StateMove extends StateCommon
private void hideAssists()
{
- map.hideAssist(selectedHex);
map.hideMoveablePawns();
}
@@ -110,7 +108,6 @@ public class StateMove extends StateCommon
activeUnit = unit;
Hex hex = activeUnit.getHex();
map.selectHex(hex);
- map.hideAssist(hex);
activeUnit.showMoveable();
map.hidePossibleMoves();
map.collectPossibleMoves(activeUnit);
@@ -121,7 +118,7 @@ public class StateMove extends StateCommon
{
to = upHex;
int s = map.collectPossiblePaths(activeUnit, to);
- map.selectHex(to);
+ map.showMove(to);
map.hidePossibleMoves();
map.showPossiblePaths();
return s;
diff --git a/core/src/ch/asynk/tankontank/game/states/StateRotate.java b/core/src/ch/asynk/tankontank/game/states/StateRotate.java
index 975a8d5..9c856fb 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateRotate.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateRotate.java
@@ -25,8 +25,6 @@ public class StateRotate extends StateCommon
} else {
if (to == null)
System.err.println("to is null but should not be");
- // show final path
- map.selectHex(to);
map.showFinalPath(to);
}
@@ -39,7 +37,6 @@ public class StateRotate extends StateCommon
@Override
public void leave(StateType nextState)
{
- map.unselectHex(to);
map.unselectHex(activeUnit.getHex());
map.hideFinalPath(to);
map.hideDirections(to);
@@ -96,7 +93,6 @@ public class StateRotate extends StateCommon
private void hideAssists()
{
map.hideMoveablePawns();
- map.hideAssist(selectedHex);
}
private void doRotation(Orientation o)