summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/tankontank/game/Hud.java
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-11-04 11:37:41 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-11-04 11:37:41 +0100
commit6d679e2f77cd35ea3e8e6cc4e3315b87afe43114 (patch)
tree4096ef1b2f5feabf763f764992c620feee481cb0 /core/src/ch/asynk/tankontank/game/Hud.java
parentbcc59be0f6af5dcab805ed0fa251bbc4bda05742 (diff)
downloadRustAndDust-6d679e2f77cd35ea3e8e6cc4e3315b87afe43114.zip
RustAndDust-6d679e2f77cd35ea3e8e6cc4e3315b87afe43114.tar.gz
hud...: replace contains(float, float) with hit(float, float)
Diffstat (limited to 'core/src/ch/asynk/tankontank/game/Hud.java')
-rw-r--r--core/src/ch/asynk/tankontank/game/Hud.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Hud.java b/core/src/ch/asynk/tankontank/game/Hud.java
index 2a72ea1..62a184e 100644
--- a/core/src/ch/asynk/tankontank/game/Hud.java
+++ b/core/src/ch/asynk/tankontank/game/Hud.java
@@ -213,10 +213,10 @@ public class Hud implements Disposable
public boolean touchDown(float x, float y)
{
- if (reinforcement.contains(x,y) || unitDock.contains(x, y)) return true;
+ if (reinforcement.hit(x,y) || unitDock.hit(x, y)) return true;
else unitDock.hide();
- if (turns.contains(x,y)) return true;
- if (!actionsBg.contains(x,y)) return false;
+ if (turns.hit(x,y)) return true;
+ if (!actionsBg.hit(x,y)) return false;
btn = null;
@@ -244,22 +244,22 @@ public class Hud implements Disposable
if (btn != null)
btn.setOn();
- if (turns.contains(x,y)) {
+ if (turns.hit(x, y)) {
ctrl.endPlayerTurn();
return true;
}
- if (reinforcement.contains(x,y)) {
+ if (reinforcement.hit(x, y)) {
unitDock.toggle();
return true;
}
- if (unitDock.contains(x,y)) {
+ if (unitDock.hit(x, y)) {
System.err.println("TODO unitDock touched");
return true;
}
- if (!actionsBg.contains(x,y)) return false;
+ if (!actionsBg.hit(x, y)) return false;
if (btn == moveBtn)
ctrl.setState(State.StateType.MOVE);