From 3b599d3b50c84d5281dedb810f9345aa5933a6f2 Mon Sep 17 00:00:00 2001
From: GGGuenni <leonard@eynck.de>
Date: Mon, 10 May 2021 23:31:11 +0200
Subject: [PATCH] Fixed inconsistent map size (#3915)

* Fixed inconsistent map size

* removed empty lines of code

* removed print
---
 core/src/com/unciv/logic/map/MapParameters.kt |  4 ++--
 core/src/com/unciv/logic/map/TileMap.kt       | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/src/com/unciv/logic/map/MapParameters.kt b/core/src/com/unciv/logic/map/MapParameters.kt
index daccdb3797..0b2d474784 100644
--- a/core/src/com/unciv/logic/map/MapParameters.kt
+++ b/core/src/com/unciv/logic/map/MapParameters.kt
@@ -23,6 +23,7 @@ class MapSizeNew {
     constructor()
 
     constructor(name: String) {
+        this.name = name
         /** Hard coded values from getEquivalentRectangularSize() */
         when (name) {
             Constants.tiny -> { radius = 10; width = 23; height = 15 }
@@ -32,6 +33,7 @@ class MapSizeNew {
             Constants.huge -> { radius = 40; width = 87; height = 57 }
         }
     }
+
     constructor(radius: Int) {
         name = Constants.custom
         this.radius = radius
@@ -47,8 +49,6 @@ class MapSizeNew {
         this.radius = getEquivalentHexagonalRadius(width, height)
 
     }
-
-
 }
 
 object MapShape {
diff --git a/core/src/com/unciv/logic/map/TileMap.kt b/core/src/com/unciv/logic/map/TileMap.kt
index d7ce8da415..39a792330b 100644
--- a/core/src/com/unciv/logic/map/TileMap.kt
+++ b/core/src/com/unciv/logic/map/TileMap.kt
@@ -135,9 +135,9 @@ class TileMap {
         if (!mapParameters.worldWrap)
             return null
 
-        var radius = mapParameters.size.radius
+        var radius = mapParameters.mapSize.radius
         if (mapParameters.shape == MapShape.rectangular)
-            radius = HexMath.getEquivalentRectangularSize(radius).x.toInt() / 2
+            radius = mapParameters.mapSize.width / 2
 
         //tile is outside of the map
         if (contains(x + radius, y - radius)) { //tile is on right side
@@ -328,9 +328,9 @@ class TileMap {
      * Returns -1 if not neighbors
      */
     fun getNeighborTileClockPosition(tile: TileInfo, otherTile: TileInfo): Int {
-        var radius = mapParameters.size.radius
+        var radius = mapParameters.mapSize.radius
         if (mapParameters.shape == MapShape.rectangular)
-            radius = HexMath.getEquivalentRectangularSize(radius).x.toInt() / 2
+            radius = mapParameters.mapSize.width / 2
 
         val xDifference = tile.position.x - otherTile.position.x
         val yDifference = tile.position.y - otherTile.position.y
@@ -358,9 +358,9 @@ class TileMap {
         if (!contains(position))
             return position //The position is outside the map so its unwrapped already
 
-        var radius = mapParameters.size.radius
+        var radius = mapParameters.mapSize.radius
         if (mapParameters.shape == MapShape.rectangular)
-            radius = HexMath.getEquivalentRectangularSize(radius).x.toInt() / 2
+            radius = mapParameters.mapSize.width / 2
 
         val vectorUnwrappedLeft = Vector2(position.x + radius, position.y - radius)
         val vectorUnwrappedRight = Vector2(position.x - radius, position.y + radius)