From 0ace2e1c7ad25c753a9b55bb62c2736bd3b99db7 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 3 Feb 2020 16:48:32 +0200 Subject: [PATCH] forgot this little thing --- core/src/com/unciv/ui/tilegroups/TileGroup.kt | 2 +- core/src/com/unciv/ui/tilegroups/TileGroupIcons.kt | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt index 805d383bef..f6b641a41f 100644 --- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt +++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt @@ -277,7 +277,7 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings) updatePixelMilitaryUnit(tileIsViewable && showMilitaryUnit) updatePixelCivilianUnit(tileIsViewable) - icons.update(showResourcesAndImprovements, tileIsViewable, showMilitaryUnit) + icons.update(showResourcesAndImprovements, tileIsViewable, showMilitaryUnit,viewingCiv) updateCityImage() updateNaturalWonderImage() diff --git a/core/src/com/unciv/ui/tilegroups/TileGroupIcons.kt b/core/src/com/unciv/ui/tilegroups/TileGroupIcons.kt index 4f509354fd..a415f17574 100644 --- a/core/src/com/unciv/ui/tilegroups/TileGroupIcons.kt +++ b/core/src/com/unciv/ui/tilegroups/TileGroupIcons.kt @@ -6,8 +6,12 @@ import com.badlogic.gdx.scenes.scene2d.ui.Image import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.utils.Align import com.unciv.UncivGame +import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.map.MapUnit -import com.unciv.ui.utils.* +import com.unciv.ui.utils.ImageGetter +import com.unciv.ui.utils.UnitGroup +import com.unciv.ui.utils.center +import com.unciv.ui.utils.toLabel /** Helper class for TileGroup, which was getting too full */ class TileGroupIcons(val tileGroup: TileGroup){ @@ -18,7 +22,7 @@ class TileGroupIcons(val tileGroup: TileGroup){ var civilianUnitIcon: UnitGroup? = null var militaryUnitIcon: UnitGroup? = null - fun update(showResourcesAndImprovements: Boolean, tileIsViewable: Boolean, showMilitaryUnit: Boolean) { + fun update(showResourcesAndImprovements: Boolean, tileIsViewable: Boolean, showMilitaryUnit: Boolean, viewingCiv:CivilizationInfo?) { updateResourceIcon(showResourcesAndImprovements) updateImprovementIcon(showResourcesAndImprovements)