From ac975b903ac17efee689bc28f363ff4141dbad90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 4 May 2016 14:06:04 +0200 Subject: StateSelect: clear() on reinforcement dock togggle --- core/src/ch/asynk/rustanddust/game/Ctrl.java | 4 +++- core/src/ch/asynk/rustanddust/game/states/StateSelect.java | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/src/ch/asynk/rustanddust/game/Ctrl.java b/core/src/ch/asynk/rustanddust/game/Ctrl.java index 02d79e5..db28b80 100644 --- a/core/src/ch/asynk/rustanddust/game/Ctrl.java +++ b/core/src/ch/asynk/rustanddust/game/Ctrl.java @@ -535,8 +535,10 @@ public abstract class Ctrl implements Disposable private void unitDockToggle() { - if (this.stateType == StateType.SELECT) + if (this.stateType == StateType.SELECT) { + sendMsg(MsgType.CANCEL); post(StateType.REINFORCEMENT); + } else if (this.stateType == StateType.REINFORCEMENT) { sendMsg(MsgType.OK); post(StateType.SELECT); diff --git a/core/src/ch/asynk/rustanddust/game/states/StateSelect.java b/core/src/ch/asynk/rustanddust/game/states/StateSelect.java index f6c42c3..8118e89 100644 --- a/core/src/ch/asynk/rustanddust/game/states/StateSelect.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateSelect.java @@ -28,6 +28,9 @@ public class StateSelect extends StateCommon case PROMOTE: changeTo(StateType.PROMOTE); return true; + case CANCEL: + clear(); + return true; } return false; -- cgit v1.1-2-g2b99