From a52a736fcc0025847ffe6647db7c64f4e31b4799 Mon Sep 17 00:00:00 2001
From: Jérémy Zurcher <jeremy@asynk.ch>
Date: Fri, 3 Oct 2014 10:17:11 +0200
Subject: GameState: remove drag(float dx, float dy) and clean up

---
 core/src/ch/asynk/tankontank/game/GameCtrl.java           |  5 -----
 core/src/ch/asynk/tankontank/game/GameState.java          |  4 ----
 core/src/ch/asynk/tankontank/game/GameStateDirection.java | 15 ---------------
 core/src/ch/asynk/tankontank/game/GameStateNone.java      | 14 --------------
 core/src/ch/asynk/tankontank/game/GameStatePath.java      | 14 --------------
 core/src/ch/asynk/tankontank/screens/GameScreen.java      |  6 ++----
 6 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/core/src/ch/asynk/tankontank/game/GameCtrl.java b/core/src/ch/asynk/tankontank/game/GameCtrl.java
index 356e4eb4..cdbced15 100644
--- a/core/src/ch/asynk/tankontank/game/GameCtrl.java
+++ b/core/src/ch/asynk/tankontank/game/GameCtrl.java
@@ -50,9 +50,4 @@ public class GameCtrl
         if (GameStateCommon.up(x, y))
             state.touchUp();
     }
-
-    public boolean drag(float dx, float dy)
-    {
-        return state.drag(dx, dy);
-    }
 }
diff --git a/core/src/ch/asynk/tankontank/game/GameState.java b/core/src/ch/asynk/tankontank/game/GameState.java
index b53195a4..af434ef7 100644
--- a/core/src/ch/asynk/tankontank/game/GameState.java
+++ b/core/src/ch/asynk/tankontank/game/GameState.java
@@ -8,11 +8,7 @@ public interface GameState
         DIRECTION
     };
 
-    public void abort();
-
     public void touchDown();
 
     public void touchUp();
-
-    public boolean drag(float dx, float dy);
 }
diff --git a/core/src/ch/asynk/tankontank/game/GameStateDirection.java b/core/src/ch/asynk/tankontank/game/GameStateDirection.java
index 733ccab0..5b98e39a 100644
--- a/core/src/ch/asynk/tankontank/game/GameStateDirection.java
+++ b/core/src/ch/asynk/tankontank/game/GameStateDirection.java
@@ -2,28 +2,13 @@ package ch.asynk.tankontank.game;
 
 public class GameStateDirection implements GameState
 {
-    @Override
-    public boolean drag(float dx, float dy)
-    {
-        return false;
-    }
-
     @Override
     public void touchDown()
     {
-        System.out.println("GameStateDirection: touchDown()");
-        // enableOverlayOn(to.x, to.y, Hex.ROSE, enable);
     }
 
     @Override
     public void touchUp()
     {
-        System.out.println("GameStateDirection: touchUp()");
-    }
-
-    @Override
-    public void abort()
-    {
-        System.err.println("GameStateDirection: abort");
     }
 }
diff --git a/core/src/ch/asynk/tankontank/game/GameStateNone.java b/core/src/ch/asynk/tankontank/game/GameStateNone.java
index 61a9d210..1d7789ae 100644
--- a/core/src/ch/asynk/tankontank/game/GameStateNone.java
+++ b/core/src/ch/asynk/tankontank/game/GameStateNone.java
@@ -14,16 +14,9 @@ public class GameStateNone extends GameStateCommon
         super(ctrl, map);
     }
 
-    @Override
-    public boolean drag(float dx, float dy)
-    {
-        return false;
-    }
-
     @Override
     public void touchDown()
     {
-        System.out.println("GameStateNone: touchDown()");
         if (map.isInPossibleMoves(downHex)) {
             ctrl.setState(State.PATH, true);
         } else {
@@ -42,14 +35,7 @@ public class GameStateNone extends GameStateCommon
     @Override
     public void touchUp()
     {
-        System.out.println("GameStateNone: touchUp()");
         if (!hexHasUnit())
             unselectHex();
     }
-
-    @Override
-    public void abort()
-    {
-        System.err.println("GameStateNone: abort");
-    }
 }
diff --git a/core/src/ch/asynk/tankontank/game/GameStatePath.java b/core/src/ch/asynk/tankontank/game/GameStatePath.java
index 808cbee6..c13c14a2 100644
--- a/core/src/ch/asynk/tankontank/game/GameStatePath.java
+++ b/core/src/ch/asynk/tankontank/game/GameStatePath.java
@@ -7,16 +7,9 @@ public class GameStatePath extends GameStateCommon
     private GridPoint2 from = new GridPoint2(-1, -1);
     private GridPoint2 to = new GridPoint2(-1, -1);
 
-    @Override
-    public boolean drag(float dx, float dy)
-    {
-        return false;
-    }
-
     @Override
     public void touchDown()
     {
-        System.out.println("GameStatePath: touchDown()");
         int s = map.possiblePathsSize();
         if (s == 0) {
             s = buildPaths();
@@ -37,13 +30,6 @@ public class GameStatePath extends GameStateCommon
     @Override
     public void touchUp()
     {
-        System.out.println("GameStatePath: touchUp()");
-    }
-
-    @Override
-    public void abort()
-    {
-        System.err.println("GameStatePath: abort");
     }
 
     private int buildPaths()
diff --git a/core/src/ch/asynk/tankontank/screens/GameScreen.java b/core/src/ch/asynk/tankontank/screens/GameScreen.java
index 41f4be6d..9e3bff51 100644
--- a/core/src/ch/asynk/tankontank/screens/GameScreen.java
+++ b/core/src/ch/asynk/tankontank/screens/GameScreen.java
@@ -144,10 +144,8 @@ public class GameScreen implements Screen
                 float deltaX = ((x - dragPos.x) * cam.zoom * screenToWorld.x);
                 float deltaY = ((dragPos.y - y) * cam.zoom * screenToWorld.y);
                 dragPos.set(x, y);
-                if (!ctrl.drag(deltaX, deltaY)) {
-                    cam.translate(-deltaX, -deltaY, 0);
-                    clampCameraPos();
-                }
+                cam.translate(-deltaX, -deltaY, 0);
+                clampCameraPos();
                 return true;
             }
             @Override
-- 
cgit v1.2.3