From 822296ff918a34acc4505a49207db302aa3fc96a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Thu, 31 Mar 2016 23:02:00 +0200 Subject: Ctrl: TOGGLE_REINFORCEMENT -> UNIT_DOCK_TOGGLE --- core/src/ch/asynk/rustanddust/game/Ctrl.java | 8 ++++---- core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/ch/asynk/rustanddust/game/Ctrl.java b/core/src/ch/asynk/rustanddust/game/Ctrl.java index bbdc8df..6079594 100644 --- a/core/src/ch/asynk/rustanddust/game/Ctrl.java +++ b/core/src/ch/asynk/rustanddust/game/Ctrl.java @@ -35,7 +35,7 @@ public abstract class Ctrl implements Disposable STATE_CHANGE, HUD_ANSWER, ANIMATIONS_DONE, - TOGGLE_REINFORCEMENT; + UNIT_DOCK_TOGGLE; } class Event @@ -217,8 +217,8 @@ public abstract class Ctrl implements Disposable case ANIMATIONS_DONE: animationsDone(); break; - case TOGGLE_REINFORCEMENT: - toggleReinforcement(); + case UNIT_DOCK_TOGGLE: + unitDockToggle(); break; default: RustAndDust.error(String.format("Unhandled Event Type : %s %s", evt.type, evt.data)); @@ -327,7 +327,7 @@ public abstract class Ctrl implements Disposable state.touch(null); } - private void toggleReinforcement() + private void unitDockToggle() { if (this.stateType == StateType.SELECT) setState(StateType.REINFORCEMENT); diff --git a/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java b/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java index 2719a87..deadabb 100644 --- a/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java +++ b/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java @@ -141,7 +141,7 @@ public class PlayerInfo implements Disposable, Drawable, Animation return true; } else if (reinforcement.hit(x, y)) { - ctrl.postEvent(Ctrl.EventType.TOGGLE_REINFORCEMENT); + ctrl.postEvent(Ctrl.EventType.UNIT_DOCK_TOGGLE); return true; } else if (unitDock.hit(x, y)) { -- cgit v1.1-2-g2b99