diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2015-12-09 22:08:12 +0100 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2015-12-09 22:08:12 +0100 |
commit | e0ede08f2bf653882318ffcaccc61bb7d76952ad (patch) | |
tree | 82a5c849e99556a4ee322b810026ace56ae0feae | |
parent | 37894a65c71227a728439542e0013e76ae84286a (diff) | |
download | RustAndDust-e0ede08f2bf653882318ffcaccc61bb7d76952ad.zip RustAndDust-e0ede08f2bf653882318ffcaccc61bb7d76952ad.tar.gz |
Ctrl: stateTouchUp() -> showEntryZone()
-rw-r--r-- | core/src/ch/asynk/rustanddust/game/Ctrl.java | 10 | ||||
-rw-r--r-- | core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Ctrl.java b/core/src/ch/asynk/rustanddust/game/Ctrl.java index 3183d4c..583381b 100644 --- a/core/src/ch/asynk/rustanddust/game/Ctrl.java +++ b/core/src/ch/asynk/rustanddust/game/Ctrl.java @@ -119,11 +119,13 @@ public class Ctrl implements Disposable state.touchUp(); } - public void stateTouchUp() + public void showEntryZone() { - state.downInMap(-1, -1); - state.upInMap(-1, -1); - state.touchUp(); + if (stateType == StateType.DEPLOYMENT) { + state.downInMap(-1, -1); + state.upInMap(-1, -1); + state.touchUp(); + } } private void turnDone() diff --git a/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java b/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java index 0e419da..2ff4d77 100644 --- a/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java +++ b/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java @@ -170,7 +170,7 @@ public class PlayerInfo implements Disposable, Drawable, Animation else if (hit == unitDock) { if (unitDock.hit(x, y)) { ctrl.hud.notify(unitDock.select(x, y).toString()); - ctrl.stateTouchUp(); + ctrl.showEntryZone(); } } |