From d3311b3f2486e2a7d93ed7f30f1deac0a6b8298a Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 30 Dec 2019 18:00:11 +0200 Subject: [PATCH] Map editor works again --- core/src/com/unciv/ui/tilegroups/TileGroup.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt index db38db33..966fcd8e 100644 --- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt @@ -133,7 +133,7 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings) fun getTileBaseImageLocations(viewingCiv: CivilizationInfo?): List{ - if (viewingCiv==null) return listOf(tileSetStrings.hexagon) + if (viewingCiv==null && !showEntireMap) return listOf(tileSetStrings.hexagon) if (tileInfo.isCityCenter()) { val terrainAndCity = tileSetStrings.getCityTile(tileInfo.baseTerrain) @@ -153,7 +153,8 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings) val shouldShowImprovement = tileInfo.improvement!=null && UncivGame.Current.settings.showPixelImprovements val shouldShowResource = UncivGame.Current.settings.showPixelImprovements - && ((tileInfo.resource!=null && UncivGame.Current.viewEntireMapForDebug) || tileInfo.hasViewableResource(viewingCiv)) + && tileInfo.resource!=null && + (showEntireMap || viewingCiv==null || tileInfo.hasViewableResource(viewingCiv)) val baseTerrainTileLocation = tileSetStrings.getTile(tileInfo.baseTerrain) // e.g. Grassland if (tileInfo.terrainFeature != null) {