mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-08 01:54:02 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix of the click on unknown civilization (#1989)

Browse Source 
* Fix of the click on unknown civilization

* Minor optimization

* Better naming of variable
This commit is contained in:
JackRainy 2020-02-22 23:10:52 +02:00 committed by GitHub
parent 13d50f250c
commit eb0fd17d9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/ui/tilegroups/CityButton.kt
View File

@ -70,13 +70,14 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski
// clicking swings the button a little down to allow selection of units there. // clicking swings the button a little down to allow selection of units there.
// this also allows to target selected units to move to the city tile from elsewhere. // this also allows to target selected units to move to the city tile from elsewhere.
if (isButtonMoved) { if (isButtonMoved) {
val viewingCiv = UncivGame.Current.worldScreen.viewingCiv
// second tap on the button will go to the city screen // second tap on the button will go to the city screen
// if this city belongs to you // if this city belongs to you
if (UncivGame.Current.viewEntireMapForDebug || belongsToViewingCiv()) { if (UncivGame.Current.viewEntireMapForDebug || belongsToViewingCiv()) {
UncivGame.Current.setScreen(CityScreen(city)) UncivGame.Current.setScreen(CityScreen(city))
} else { } else if (viewingCiv.knows(city.civInfo)) {
// If city doesn't belong to you, go directly to its owner's diplomacy screen. // If city doesn't belong to you, go directly to its owner's diplomacy screen.
val screen = DiplomacyScreen(UncivGame.Current.worldScreen.viewingCiv) val screen = DiplomacyScreen(viewingCiv)
screen.updateRightSide(city.civInfo) screen.updateRightSide(city.civInfo)
UncivGame.Current.setScreen(screen) UncivGame.Current.setScreen(screen)
} }