summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2016-03-31 23:02:00 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2016-03-31 23:02:00 +0200
commit822296ff918a34acc4505a49207db302aa3fc96a (patch)
tree13fd7ded835140f0d9cbe5b1b159813375948243
parentbe736b3a1c31eed88711dc1ae750e9bfdd1f3e63 (diff)
downloadRustAndDust-822296ff918a34acc4505a49207db302aa3fc96a.zip
RustAndDust-822296ff918a34acc4505a49207db302aa3fc96a.tar.gz
Ctrl: TOGGLE_REINFORCEMENT -> UNIT_DOCK_TOGGLE
-rw-r--r--core/src/ch/asynk/rustanddust/game/Ctrl.java8
-rw-r--r--core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java2
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)) {