diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-09-30 10:07:08 +0200 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-09-30 10:07:08 +0200 |
commit | 531ad5e25045479b1f61dab8f633eb06936139cd (patch) | |
tree | b6e41cdb29c7127d4ff73648493c5f618fd10538 /core/src/ch/asynk/tankontank/screens | |
parent | 2e0e59e767c512c93409ca5ac4da3fda583b7719 (diff) | |
download | RustAndDust-531ad5e25045479b1f61dab8f633eb06936139cd.zip RustAndDust-531ad5e25045479b1f61dab8f633eb06936139cd.tar.gz |
Map/GameScreen: clean up
Diffstat (limited to 'core/src/ch/asynk/tankontank/screens')
-rw-r--r-- | core/src/ch/asynk/tankontank/screens/GameScreen.java | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/core/src/ch/asynk/tankontank/screens/GameScreen.java b/core/src/ch/asynk/tankontank/screens/GameScreen.java index 0dbb4a9..b2222d6 100644 --- a/core/src/ch/asynk/tankontank/screens/GameScreen.java +++ b/core/src/ch/asynk/tankontank/screens/GameScreen.java @@ -138,7 +138,7 @@ public class GameScreen implements Screen float deltaX = ((x - dragPos.x) * cam.zoom * screenToViewport.x); float deltaY = ((dragPos.y - y) * cam.zoom * screenToViewport.y); dragPos.set(x, y); - if(map.drag(deltaX, deltaY)) { + if (map.drag(deltaX, deltaY)) { cam.unproject(touchPos.set(x, y, 0)); map.getHexAt(cell, touchPos.x, touchPos.y); } else { @@ -154,12 +154,6 @@ public class GameScreen implements Screen dragPos.set(x, y); cam.unproject(touchPos.set(x, y, 0)); map.touchDown(touchPos.x, touchPos.y); - } else if (button == Input.Buttons.RIGHT) { - cam.unproject(touchPos.set(x, y, 0)); - map.showMoves(touchPos.x, touchPos.y); - } else { - cam.unproject(touchPos.set(x, y, 0)); - map.lineOfSight(touchPos.x, touchPos.y); } return true; } |