From 66b6be5858e58404a97c2d1ac05c4bcfd2135b20 Mon Sep 17 00:00:00 2001 From: yairm210 Date: Thu, 5 Dec 2024 21:18:10 +0200 Subject: [PATCH] chore: code linting --- .../tilegroups/layers/TileLayerCityButton.kt | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerCityButton.kt b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerCityButton.kt index 7cc9e25eb3..6941f5f028 100644 --- a/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerCityButton.kt +++ b/core/src/com/unciv/ui/components/tilegroups/layers/TileLayerCityButton.kt @@ -45,9 +45,7 @@ class TileLayerCityButton(tileGroup: TileGroup, size: Float) : TileLayer(tileGro } override fun doUpdate(viewingCiv: Civilization?, localUniqueCache: LocalUniqueCache) { - - if (tileGroup !is WorldTileGroup) - return + if (tileGroup !is WorldTileGroup) return val city = tile().getCity() @@ -57,21 +55,16 @@ class TileLayerCityButton(tileGroup: TileGroup, size: Float) : TileLayer(tileGro cityButton = null } - if (viewingCiv == null) - return - - val tileIsViewable = isViewable(viewingCiv) - val shouldShow = DebugUtils.VISIBLE_MAP - + if (viewingCiv == null) return + if (city == null || !tileGroup.tile.isCityCenter()) return + // Create (if not yet) and update city button - if (city != null && tileGroup.tile.isCityCenter()) { - if (cityButton == null) { - cityButton = CityButton(city, tileGroup) - addActor(cityButton) - } - - cityButton!!.update(shouldShow || tileIsViewable) + if (cityButton == null) { + cityButton = CityButton(city, tileGroup) + addActor(cityButton) } + + cityButton!!.update(DebugUtils.VISIBLE_MAP || isViewable(viewingCiv)) } }