summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk
diff options
context:
space:
mode:
Diffstat (limited to 'core/src/ch/asynk')
-rw-r--r--core/src/ch/asynk/rustanddust/game/Ctrl.java70
1 files changed, 36 insertions, 34 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Ctrl.java b/core/src/ch/asynk/rustanddust/game/Ctrl.java
index 0d414bc..3183d4c 100644
--- a/core/src/ch/asynk/rustanddust/game/Ctrl.java
+++ b/core/src/ch/asynk/rustanddust/game/Ctrl.java
@@ -90,6 +90,42 @@ public class Ctrl implements Disposable
map.dispose();
}
+ // INPUTS
+
+ public boolean drag(int dx, int dy)
+ {
+ if (!blockHud && hud.drag(hudTouch.x, hudTouch.y, dx, dy))
+ return true;
+ return false;
+ }
+
+ public void touchDown()
+ {
+ boolean inAnimation = (this.stateType == StateType.ANIMATION);
+
+ if (!blockHud && hud.touchDown(hudTouch.x, hudTouch.y, inAnimation))
+ return;
+
+ if (!blockMap && state.downInMap(mapTouch.x, mapTouch.y))
+ state.touchDown();
+ }
+
+ public void touchUp()
+ {
+ if (!blockHud && hud.touchUp(hudTouch.x, hudTouch.y))
+ return;
+
+ if (!blockMap && state.upInMap(mapTouch.x, mapTouch.y))
+ state.touchUp();
+ }
+
+ public void stateTouchUp()
+ {
+ state.downInMap(-1, -1);
+ state.upInMap(-1, -1);
+ state.touchUp();
+ }
+
private void turnDone()
{
if (battle.turnDone())
@@ -212,40 +248,6 @@ public class Ctrl implements Disposable
}
- public boolean drag(int dx, int dy)
- {
- if (!blockHud && hud.drag(hudTouch.x, hudTouch.y, dx, dy))
- return true;
- return false;
- }
-
- public void touchDown()
- {
- boolean inAnimation = (this.stateType == StateType.ANIMATION);
-
- if (!blockHud && hud.touchDown(hudTouch.x, hudTouch.y, inAnimation))
- return;
-
- if (!blockMap && state.downInMap(mapTouch.x, mapTouch.y))
- state.touchDown();
- }
-
- public void touchUp()
- {
- if (!blockHud && hud.touchUp(hudTouch.x, hudTouch.y))
- return;
-
- if (!blockMap && state.upInMap(mapTouch.x, mapTouch.y))
- state.touchUp();
- }
-
- public void stateTouchUp()
- {
- state.downInMap(-1, -1);
- state.upInMap(-1, -1);
- state.touchUp();
- }
-
public void setAfterAnimationState(StateType after)
{
stateAfterAnimation = after;