Map: change enableXyz into showXyz

1 files changed, 29 insertions, 29 deletions

diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java
index 8048576..ae859eb 100644
--- a/core/src/ch/asynk/tankontank/game/Map.java
+++ b/core/src/ch/asynk/tankontank/game/Map.java
@@ -70,25 +70,25 @@ public abstract class Map extends Board
         return possibleTargets.contains(hex);
     }
 
-    public void enablePossibleMoves(boolean enable)
+    public void showPossibleMoves(boolean enable)
     {
         for(GridPoint2 hex : possibleMoves)
             enableOverlayOn(hex, Hex.MOVE1, enable);
     }
 
-    public void enableMoveAssists(boolean enable)
+    public void showMoveAssists(boolean enable)
     {
         for(GridPoint2 hex : moveAssists)
             enableOverlayOn(hex, Hex.ASSIST, enable);
     }
 
-    public void enablePossibleTargets(boolean enable)
+    public void showPossibleTargets(boolean enable)
     {
         for(GridPoint2 hex : possibleTargets)
             enableOverlayOn(hex, Hex.TARGET, enable);
     }
 
-    public void enablePossiblePaths(boolean enable, boolean keepFinal)
+    public void showPossiblePaths(boolean enable, boolean keepFinal)
     {
         if (keepFinal) {
             for(GridPoint2 hex : possiblePaths)
@@ -101,6 +101,31 @@ public abstract class Map extends Board
         }
     }
 
+    public void showFinalPath(GridPoint2 dst, boolean enable)
+    {
+        for(GridPoint2 hex : possiblePaths) {
+            enableOverlayOn(hex, Hex.MOVE1, false);
+            enableOverlayOn(hex, Hex.MOVE2, enable);
+        }
+        showDirections(dst, enable);
+    }
+
+    public void showDirections(GridPoint2 hex, boolean enable)
+    {
+        enableOverlayOn(hex, Hex.DIRECTIONS, enable);
+    }
+
+    public int possiblePathsSize()
+    {
+        return possiblePaths.size();
+    }
+
+    public void togglePathOverlay(GridPoint2 hex)
+    {
+        boolean enable= !isOverlayEnabledOn(hex, Hex.MOVE2);
+        enableOverlayOn(hex, Hex.MOVE2, enable);
+    }
+
     public int buildPossibleMoves(Pawn pawn, GridPoint2 hex)
     {
         buildPossibleMovesFrom(pawn, hex, possibleMoves);
@@ -123,11 +148,6 @@ public abstract class Map extends Board
         return moveAssists.size();
     }
 
-    public int possiblePathsSize()
-    {
-        return possiblePaths.size();
-    }
-
     public int buildPossiblePaths(Pawn pawn, GridPoint2 from, GridPoint2 to)
     {
         return possiblePaths(pawn, from, to, possiblePaths);
@@ -150,21 +170,6 @@ public abstract class Map extends Board
         clearPointVector(possibleTargets);
     }
 
-    public void togglePathOverlay(GridPoint2 hex)
-    {
-        boolean enable= !isOverlayEnabledOn(hex, Hex.MOVE2);
-        enableOverlayOn(hex, Hex.MOVE2, enable);
-    }
-
-    public void enableFinalPath(GridPoint2 dst, boolean enable)
-    {
-        for(GridPoint2 hex : possiblePaths) {
-            enableOverlayOn(hex, Hex.MOVE1, false);
-            enableOverlayOn(hex, Hex.MOVE2, enable);
-        }
-        enableDirections(dst, enable);
-    }
-
     public void movePawn(Pawn pawn, Orientation o)
     {
         int s = getCoordinatePath(pawn, finalPath, o);
@@ -187,9 +192,4 @@ public abstract class Map extends Board
             }
         }));
     }
-
-    public void enableDirections(GridPoint2 hex, boolean enable)
-    {
-        enableOverlayOn(hex, Hex.DIRECTIONS, enable);
-    }
 }