From 3e51983237e902abb6ab2c4837cd84485b2aee7a Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Mon, 5 Jan 2015 01:49:00 +0000
Subject: [PATCH] Code cleanup

---
 .../planarconquest/CommandCenterScreen.java   |  3 +-
 .../planarconquest/ConquestPlaneMap.java      | 32 ++-----------------
 2 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/CommandCenterScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/CommandCenterScreen.java
index e193e42cb24..1286d52df9e 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/CommandCenterScreen.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/CommandCenterScreen.java
@@ -271,8 +271,7 @@ public class CommandCenterScreen extends FScreen implements IVCommandCenter {
                 break;
             }
 
-            //transform image based on grid coordinates so tiles blend together better
-            g.drawImageWithTransforms(tileImage.getTextureRegion(), x, y, w, h, tile.getImageRotation(), tile.flipImageX(), tile.flipImageY());
+            g.drawImage(tileImage, x, y, w, h);
             g.drawImage(FSkinImage.HEXAGON_TILE, x, y, w, h);
 
             /*if (x < getWidth() / 2 && x + w > getWidth() / 2 && y < getHeight() / 2 && y + h > getHeight() / 2) {
diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestPlaneMap.java b/forge-gui/src/main/java/forge/planarconquest/ConquestPlaneMap.java
index a94997057ba..971616fbcbc 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestPlaneMap.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestPlaneMap.java
@@ -109,9 +109,9 @@ public class ConquestPlaneMap {
         double regionAngle = 2 * Math.PI / regionCount;
 
         //these assume a tile width of 2, radius of 1
-        double centerY = 1.5 * center;
         double centerX = sqrt3 * (center + 0.5f * (center & 1));
-        double maxDist = (centerY + centerX) / 2;
+        double centerY = 1.5 * center;
+        double maxDist = (centerX + centerY) / 2;
 
         //create a circular map, divided into regions
         for (int r = 0; r < gridSize; r++) {
@@ -172,34 +172,6 @@ public class ConquestPlaneMap {
             return colorIndex;
         }
 
-        public float getImageRotation() {
-            return 0;
-        }
-
-        public boolean flipImageX() {
-            /*if (q % 2 == 1) {
-                if (q % 4 == 1) {
-                    return r % 2 == 1;
-                }
-                return r % 2 == 0;
-            }*/
-            return false;
-        }
-
-        public boolean flipImageY() {
-            /*if (q % 2 == 0) {
-                if (q % 4 == 0) {
-                    return r % 2 == 1;
-                }
-                return r % 2 == 0;
-            }
-            if (q % 4 == 1) {
-                return r % 2 == 1;
-            }
-            return r % 2 == 0;*/
-            return false;
-        }
-
         public List<HexagonTile> getNeighbors() {
             List<HexagonTile> neighbors = new ArrayList<HexagonTile>();
             addToList(q, r - 1, neighbors); //tile above