AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 15:01:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #593 - Show/Hide resources and improvements button wasn't working

Browse Source
This commit is contained in:
Yair Morgenstern 2019-03-22 10:57:18 +02:00
parent a3542597ae
commit a751ed6e31
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 939 KiB

After

Width:  |  Height:  |  Size: 939 KiB

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

@ -392,18 +392,11 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
} }
private fun updateResourceImage(showResourcesAndImprovements: Boolean) { private fun updateResourceImage(showResourcesAndImprovements: Boolean) {
val shouldDisplayResource =
if(showEntireMap) tileInfo.resource!=null
else showResourcesAndImprovements
&& tileInfo.hasViewableResource(tileInfo.tileMap.gameInfo.getCurrentPlayerCivilization())
if(resource!=tileInfo.resource){ if(resource!=tileInfo.resource){
resource=tileInfo.resource resource=tileInfo.resource
if (resourceImage != null) resourceImage!!.remove() if (resourceImage != null) resourceImage!!.remove()
resourceImage=null if (resource==null) resourceImage=null
} else {
if (resourceImage == null && shouldDisplayResource) { // This could happen on any turn, since resources need certain techs to reveal them
resourceImage = ImageGetter.getResourceImage(tileInfo.resource!!, 20f) resourceImage = ImageGetter.getResourceImage(tileInfo.resource!!, 20f)
resourceImage!!.center(this) resourceImage!!.center(this)
resourceImage!!.x = resourceImage!!.x - 22 // left resourceImage!!.x = resourceImage!!.x - 22 // left
@ -412,6 +405,15 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
} }
} }
if (resourceImage != null) { // This could happen on any turn, since resources need certain techs to reveal them
val shouldDisplayResource =
if(showEntireMap) tileInfo.resource!=null
else showResourcesAndImprovements
&& tileInfo.hasViewableResource(tileInfo.tileMap.gameInfo.getCurrentPlayerCivilization())
resourceImage!!.isVisible = shouldDisplayResource
}
}
protected fun newUnitImage(unit: MapUnit?, oldUnitGroup: UnitGroup?, isViewable: Boolean, yFromCenter: Float): UnitGroup? { protected fun newUnitImage(unit: MapUnit?, oldUnitGroup: UnitGroup?, isViewable: Boolean, yFromCenter: Float): UnitGroup? {
var newImage: UnitGroup? = null var newImage: UnitGroup? = null