From 15b3b7ddcdb60750df1c1874137565732e07b110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Mon, 13 Oct 2014 09:58:09 +0200
Subject: clean debug System.err

---
 core/src/ch/asynk/tankontank/game/Ctrl.java               | 7 +++----
 core/src/ch/asynk/tankontank/game/Map.java                | 6 +++---
 core/src/ch/asynk/tankontank/game/Player.java             | 4 +++-
 core/src/ch/asynk/tankontank/game/states/StateCommon.java | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java
index 1011efa..ed04a63 100644
--- a/core/src/ch/asynk/tankontank/game/Ctrl.java
+++ b/core/src/ch/asynk/tankontank/game/Ctrl.java
@@ -73,7 +73,7 @@ public class Ctrl implements Disposable
     public void setAnimationCount(int count)
     {
         animationCount = count;
-        System.err.println(" setAnimationCount(" + count + ")");
+        System.err.println("    setAnimationCount(" + count + ")");
     }
 
     public void animationDone()
@@ -82,7 +82,7 @@ public class Ctrl implements Disposable
         if (animationCount == 0)
             state.done();
         if (animationCount < 0)
-            System.err.println("animationCount < 0");
+            System.err.println("    animationCount < 0");
     }
 
     private void nextPlayer()
@@ -103,7 +103,7 @@ public class Ctrl implements Disposable
     {
         this.state.leave(state);
 
-        System.err.println("Switch to : " + state + " " + normal);
+        System.err.println("  switch to : " + state + " " + normal);
         switch(state) {
             case SELECT:
                 this.state = selectState;
@@ -127,7 +127,6 @@ public class Ctrl implements Disposable
 
     private void checkTurnEnd()
     {
-        System.err.println(" current player : " + currentPlayer.toString());
         if (map.activatedPawnsCount() > 0) {
             currentPlayer.burnDownOneAp();
         }
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java
index ec94726..d98d1b5 100644
--- a/core/src/ch/asynk/tankontank/game/Map.java
+++ b/core/src/ch/asynk/tankontank/game/Map.java
@@ -228,7 +228,7 @@ public abstract class Map extends Board
 
     public int movePawn(Pawn pawn, GridPoint2 from, Orientation o)
     {
-        System.err.println(" movePawn : " + from.x + ";" + from.y + " " + o);
+        System.err.println("    movePawn : " + from.x + ";" + from.y + " " + o);
         int cost = getPathCost(pawn, 0);
         int s = getCoordinatePath(pawn, 0, finalPath, o);
         if (s > 0) {
@@ -245,7 +245,7 @@ public abstract class Map extends Board
 
     public int rotatePawn(Pawn pawn, GridPoint2 from, Orientation o)
     {
-        System.err.println(" rotatePawn : " + from.x + ";" + from.y + " " +o);
+        System.err.println("    rotatePawn : " + from.x + ";" + from.y + " " +o);
         rotatePawn(pawn, o, RunnableAnimation.get(pawn, new Runnable() {
             @Override
             public void run() {
@@ -258,7 +258,7 @@ public abstract class Map extends Board
 
     public void revertMoves()
     {
-        System.err.println(" revertMoves()");
+        System.err.println("    revertMoves()");
         for (Pawn pawn : activatedPawns) {
             revertLastPawnMove(pawn, RunnableAnimation.get(pawn, new Runnable() {
                 @Override
diff --git a/core/src/ch/asynk/tankontank/game/Player.java b/core/src/ch/asynk/tankontank/game/Player.java
index a28e2a9..5a73b30 100644
--- a/core/src/ch/asynk/tankontank/game/Player.java
+++ b/core/src/ch/asynk/tankontank/game/Player.java
@@ -39,7 +39,7 @@ public class Player implements Drawable, Disposable
 
     public String toString()
     {
-        return "Player : " + army + " AP: " + actionPoints +
+        return army + " AP: " + actionPoints +
             " units:" + units.size() + " losses:" + losses.size() + " reinforcement:" + reinforcement.size();
     }
 
@@ -72,6 +72,7 @@ public class Player implements Drawable, Disposable
 
     public void turnEnd()
     {
+        System.err.println("TurnEnd   " + toString());
     }
 
     public void turnStart()
@@ -79,6 +80,7 @@ public class Player implements Drawable, Disposable
         for (Pawn pawn : units)
             pawn.reset();
         setActionPoints();
+        System.err.println("TurnStart " + toString());
     }
 
     private void setActionPoints()
diff --git a/core/src/ch/asynk/tankontank/game/states/StateCommon.java b/core/src/ch/asynk/tankontank/game/states/StateCommon.java
index 8d7a48d..d775472 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateCommon.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateCommon.java
@@ -104,7 +104,7 @@ public abstract class StateCommon implements State
             isEnemy = ctrl.currentPlayer.isEnemy(selectedPawn);
         else
             isEnemy = false;
-        System.err.println((isEnemy ? "enemy " : "friend ") + selectedPawn + " (" + selectedHex.x + ";" + selectedHex.y + ")");
+        System.err.println("  select (" + selectedHex.x + ";" + selectedHex.y + ") "  + selectedPawn + (isEnemy ? " enemy " : "friend "));
     }
 
     protected boolean hasPawn()
-- 
cgit v1.1-2-g2b99