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

Do not enter the city while performing an air strikes sequence (#7148)

Browse Source
This commit is contained in:
Jack Rainy 2022-06-14 14:42:53 +03:00 committed by GitHub
parent ed922b182d
commit 9ffd9b817b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,9 +163,10 @@ class CityButton(val city: CityInfo, private val tileGroup: WorldTileGroup): Tab
if (isButtonMoved) { if (isButtonMoved) {
val viewingCiv = worldScreen.viewingCiv val viewingCiv = 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 and you are not iterating though the air units
if (uncivGame.viewEntireMapForDebug || belongsToViewingCiv() || viewingCiv.isSpectator()) { if (uncivGame.viewEntireMapForDebug || viewingCiv.isSpectator()
uncivGame.setScreen(CityScreen(city)) || (belongsToViewingCiv() && !tileGroup.tileInfo.airUnits.contains(unitTable.selectedUnit))) {
uncivGame.setScreen(CityScreen(city))
} else if (viewingCiv.knows(city.civInfo)) { } else if (viewingCiv.knows(city.civInfo)) {
foreignCityInfoPopup() foreignCityInfoPopup()
} }