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

Fixed Great Person Picker screen not responding

Browse Source
This commit is contained in:
Yair Morgenstern 2022-10-23 19:31:03 +03:00
parent 1749efa50a
commit adeac67dce
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View File

@ -427,7 +427,8 @@ class WorldScreen(
UncivGame.Current.pushScreen(DiplomaticVoteResultScreen(gameInfo.diplomaticVictoryVotesCast, viewingCiv)) UncivGame.Current.pushScreen(DiplomaticVoteResultScreen(gameInfo.diplomaticVictoryVotesCast, viewingCiv))
!gameInfo.oneMoreTurnMode && (viewingCiv.isDefeated() || gameInfo.civilizations.any { it.victoryManager.hasWon() }) -> !gameInfo.oneMoreTurnMode && (viewingCiv.isDefeated() || gameInfo.civilizations.any { it.victoryManager.hasWon() }) ->
game.pushScreen(VictoryScreen(this)) game.pushScreen(VictoryScreen(this))
viewingCiv.greatPeople.freeGreatPeople > 0 -> game.pushScreen(GreatPersonPickerScreen(viewingCiv)) viewingCiv.greatPeople.freeGreatPeople > 0 ->
game.pushScreen(GreatPersonPickerScreen(viewingCiv))
viewingCiv.popupAlerts.any() -> AlertPopup(this, viewingCiv.popupAlerts.first()).open() viewingCiv.popupAlerts.any() -> AlertPopup(this, viewingCiv.popupAlerts.first()).open()
viewingCiv.tradeRequests.isNotEmpty() -> { viewingCiv.tradeRequests.isNotEmpty() -> {
// In the meantime this became invalid, perhaps because we accepted previous trades // In the meantime this became invalid, perhaps because we accepted previous trades
@ -789,7 +790,8 @@ class WorldScreen(
Gdx.input.inputProcessor = null Gdx.input.inputProcessor = null
update() update()
showTutorialsOnNextTurn() showTutorialsOnNextTurn()
Gdx.input.inputProcessor = stage if (Gdx.input.inputProcessor == null) // Update may have replaced the worldscreen with a GreatPersonPickerScreen etc, so the input would already be set
Gdx.input.inputProcessor = stage
} }
// topBar.selectedCivLabel.setText(Gdx.graphics.framesPerSecond) // for framerate testing // topBar.selectedCivLabel.setText(Gdx.graphics.framesPerSecond) // for framerate testing