summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/tankontank/game/states
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-11-17 15:52:32 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-11-17 15:52:32 +0100
commitbae96611e3659847f3bbf6583ae63ebcb960a2c6 (patch)
treef334c6006a900d6b4846059c1ff0a45b6de75a90 /core/src/ch/asynk/tankontank/game/states
parent624fc8b61f909e95ec42c0eb5ab17be2e63e4c46 (diff)
downloadRustAndDust-bae96611e3659847f3bbf6583ae63ebcb960a2c6.zip
RustAndDust-bae96611e3659847f3bbf6583ae63ebcb960a2c6.tar.gz
UnitDock: references List<Unit> not List<Pawn>
Diffstat (limited to 'core/src/ch/asynk/tankontank/game/states')
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateDeployment.java2
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateReinforcement.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
index 3be9201..a30d59c 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
@@ -61,7 +61,7 @@ public class StateDeployment extends StateCommon
@Override
public void touchUp()
{
- Unit unit = ctrl.hud.playerInfo.getDockUnit();
+ Unit unit = ctrl.hud.playerInfo.unitDock.selectedUnit;
if (!done && (unit != null) && (unit != activeUnit)) {
changeUnit(unit);
} else if (selectedUnit != null) {
diff --git a/core/src/ch/asynk/tankontank/game/states/StateReinforcement.java b/core/src/ch/asynk/tankontank/game/states/StateReinforcement.java
index 2c423c6..33668db 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateReinforcement.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateReinforcement.java
@@ -50,7 +50,7 @@ public class StateReinforcement extends StateCommon
@Override
public void touchUp()
{
- Unit unit = ctrl.hud.playerInfo.getDockUnit();
+ Unit unit = ctrl.hud.playerInfo.unitDock.selectedUnit;
if ((unit != null) && (unit != activeUnit))
changeUnit(unit);
else if ((entryPoint != null) && upHex.isEmpty() && entryPoint.contains(upHex))