diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2015-12-10 17:00:19 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2015-12-10 17:00:19 +0100 |
| commit | 53a0390318f7ca7f4ab4d83301e9a6825970f2b0 (patch) | |
| tree | c167a2659fc896bff2a7ad982ff4d8e93758ef92 /core/src/ch | |
| parent | c533126c9f5a352ee95b0a41c0406125e03bee25 (diff) | |
| download | RustAndDust-53a0390318f7ca7f4ab4d83301e9a6825970f2b0.zip RustAndDust-53a0390318f7ca7f4ab4d83301e9a6825970f2b0.tar.gz | |
Revert "StateDeployment: call Map.setOnBoard() remove Map.showOnBoard()"
This reverts commit 5b93add487fc94a1019189b6d406fa7c6317da0a.
we need this to only emit 1 Command on deployment
Diffstat (limited to 'core/src/ch')
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/map/Map4Commands.java | 5 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/states/StateDeployment.java | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/map/Map4Commands.java b/core/src/ch/asynk/rustanddust/game/map/Map4Commands.java index 641107d..7bb6293 100644 --- a/core/src/ch/asynk/rustanddust/game/map/Map4Commands.java +++ b/core/src/ch/asynk/rustanddust/game/map/Map4Commands.java @@ -44,6 +44,11 @@ public abstract class Map4Commands extends Map3Animations // STATES ENTRY -> + public void showOnBoard(final Unit unit, Hex to, Orientation o) + { + setPawnOnto(unit, to, o); + } + public boolean setOnBoard(final Unit unit, Hex to, Orientation entry) { commands.dispose(unit); diff --git a/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java b/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java index 5b53f84..d34d0dd 100644 --- a/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java @@ -102,7 +102,7 @@ public class StateDeployment extends StateCommon selectedUnit = unit; selectedHex = upHex; ctrl.battle.getPlayer().reinforcement.remove(unit); - map.setOnBoard(unit, upHex, entryZone.orientation); + map.showOnBoard(unit, upHex, entryZone.orientation); deployedUnits.add(unit); entryZone.enable(Hex.AREA, false); showRotation(unit, upHex); |