mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-22 05:41:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

forgot this little thing

Browse Source
This commit is contained in:
Yair Morgenstern
2020-02-03 16:48:32 +02:00
parent 848637c78c
commit 0ace2e1c7a
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/ui/tilegroups/TileGroup.kt
View File

@ -277,7 +277,7 @@ open class TileGroup(var tileInfo: TileInfo, var tileSetStrings:TileSetStrings)
updatePixelMilitaryUnit(tileIsViewable && showMilitaryUnit) updatePixelMilitaryUnit(tileIsViewable && showMilitaryUnit)
updatePixelCivilianUnit(tileIsViewable) updatePixelCivilianUnit(tileIsViewable)
icons.update(showResourcesAndImprovements, tileIsViewable, showMilitaryUnit) icons.update(showResourcesAndImprovements, tileIsViewable, showMilitaryUnit,viewingCiv)
updateCityImage() updateCityImage()
updateNaturalWonderImage() updateNaturalWonderImage()

8
core/src/com/unciv/ui/tilegroups/TileGroupIcons.kt
View File

@ -6,8 +6,12 @@ import com.badlogic.gdx.scenes.scene2d.ui.Image
import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.utils.Align import com.badlogic.gdx.utils.Align
import com.unciv.UncivGame import com.unciv.UncivGame
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.MapUnit 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 */ /** Helper class for TileGroup, which was getting too full */
class TileGroupIcons(val tileGroup: TileGroup){ class TileGroupIcons(val tileGroup: TileGroup){
@ -18,7 +22,7 @@ class TileGroupIcons(val tileGroup: TileGroup){
var civilianUnitIcon: UnitGroup? = null var civilianUnitIcon: UnitGroup? = null
var militaryUnitIcon: 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) updateResourceIcon(showResourcesAndImprovements)
updateImprovementIcon(showResourcesAndImprovements) updateImprovementIcon(showResourcesAndImprovements)