From c56a67211c2eea2a79382b7e0afbd3549fd09456 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Wed, 4 Apr 2018 23:17:27 +0300
Subject: [PATCH] Now can't see units that we're not supposed to see =)

---
 core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt | 11 ++++++-----
 core/src/com/unciv/ui/worldscreen/TileMapHolder.kt |  6 +-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt b/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt
index 8e46dacb6a..d5396c77b8 100644
--- a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt
+++ b/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt
@@ -4,11 +4,11 @@ import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.scenes.scene2d.Group
 import com.badlogic.gdx.scenes.scene2d.ui.TextButton
 import com.unciv.logic.map.TileInfo
+import com.unciv.ui.UnCivGame
 import com.unciv.ui.cityscreen.CityScreen
 import com.unciv.ui.cityscreen.addClickListener
 import com.unciv.ui.utils.CameraStageBaseScreen
 import com.unciv.ui.utils.ImageGetter
-import com.unciv.ui.worldscreen.WorldScreen
 
 
 class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) {
@@ -20,11 +20,13 @@ class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) {
             setColor(0f, 0f, 0f, 1f) // Only alpha really changes anything
             tileInfo.explored = true
             update()
-        } else
+        } else{
             setColor(0f, 0f, 0f, 0.6f)
+            update()
+        }
     }
 
-    fun update(worldScreen: WorldScreen) {
+    override fun update() {
         super.update()
 
         if (tileInfo.workingCity != null && populationImage == null) addPopulationIcon()
@@ -38,8 +40,7 @@ class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) {
                 cityButton =  TextButton("", CameraStageBaseScreen.skin)
                 cityButton!!.label.setFontScale(buttonScale)
 
-                val game = worldScreen.game
-                cityButton!!.addClickListener { game.screen = CityScreen(city!!)}
+                cityButton!!.addClickListener { UnCivGame.Current.screen = CityScreen(city!!)}
 
                 addActor(cityButton)
                 zIndex = parent.children.size // so this tile is rendered over neighboring tiles
diff --git a/core/src/com/unciv/ui/worldscreen/TileMapHolder.kt b/core/src/com/unciv/ui/worldscreen/TileMapHolder.kt
index 094d4dee71..2849948837 100644
--- a/core/src/com/unciv/ui/worldscreen/TileMapHolder.kt
+++ b/core/src/com/unciv/ui/worldscreen/TileMapHolder.kt
@@ -80,20 +80,16 @@ class TileMapHolder(internal val worldScreen: WorldScreen, internal val tileMap:
     }
 
     internal fun updateTiles() {
-        for (WG in tileGroups.values) WG.update(worldScreen)
+        for (WG in tileGroups.values) WG.setIsViewable(false) // also updates them
 
-        for (WG in tileGroups.values) WG.setIsViewable(false)
         val viewablePositions: List<Vector2>
         if(worldScreen.unitTable.currentlyExecutingAction == null)
             viewablePositions = civInfo.getViewableTiles().map { it.position }
-
         else
             viewablePositions = worldScreen.unitTable.getViewablePositionsForExecutingAction()
 
-
         for (string in viewablePositions.map { it.toString() }.filter { tileGroups.containsKey(it) })
             tileGroups[string]!!.setIsViewable(true)
-
     }
 
     fun setCenterPosition(vector: Vector2) {