mirror of
https://github.com/yairm210/Unciv.git
synced 2025-09-29 23:10:39 -04:00
Fix crash
This commit is contained in:
parent
315adb7648
commit
7e36d62b6e
@ -235,6 +235,7 @@ class UncivGame(parameters: UncivGameParameters) : Game() {
|
|||||||
/**
|
/**
|
||||||
* @throws UnsupportedOperationException Use pushScreen or replaceCurrentScreen instead
|
* @throws UnsupportedOperationException Use pushScreen or replaceCurrentScreen instead
|
||||||
*/
|
*/
|
||||||
|
@Deprecated("Never use this, it's only here because it's part of the gdx.Game interface.", ReplaceWith("pushScreen"))
|
||||||
override fun setScreen(screen: Screen) {
|
override fun setScreen(screen: Screen) {
|
||||||
throw UnsupportedOperationException("Use pushScreen or replaceCurrentScreen instead")
|
throw UnsupportedOperationException("Use pushScreen or replaceCurrentScreen instead")
|
||||||
}
|
}
|
||||||
|
@ -44,17 +44,17 @@ class TechPolicyDiplomacyButtons(val worldScreen: WorldScreen) : Table(BaseScree
|
|||||||
pickTechButton.defaults().pad(20f)
|
pickTechButton.defaults().pad(20f)
|
||||||
pickTechButton.add(pickTechLabel)
|
pickTechButton.add(pickTechLabel)
|
||||||
techButtonHolder.onClick(UncivSound.Paper) {
|
techButtonHolder.onClick(UncivSound.Paper) {
|
||||||
game.setScreen(TechPickerScreen(viewingCiv))
|
game.pushScreen(TechPickerScreen(viewingCiv))
|
||||||
}
|
}
|
||||||
|
|
||||||
policyScreenButton.add(ImageGetter.getImage("PolicyIcons/Constitution")).size(30f).pad(15f)
|
policyScreenButton.add(ImageGetter.getImage("PolicyIcons/Constitution")).size(30f).pad(15f)
|
||||||
policyButtonHolder.onClick {
|
policyButtonHolder.onClick {
|
||||||
game.setScreen(PolicyPickerScreen(worldScreen))
|
game.pushScreen(PolicyPickerScreen(worldScreen))
|
||||||
}
|
}
|
||||||
|
|
||||||
diplomacyButton.add(ImageGetter.getImage("OtherIcons/DiplomacyW")).size(30f).pad(15f)
|
diplomacyButton.add(ImageGetter.getImage("OtherIcons/DiplomacyW")).size(30f).pad(15f)
|
||||||
diplomacyButtonHolder.onClick {
|
diplomacyButtonHolder.onClick {
|
||||||
game.setScreen(DiplomacyScreen(viewingCiv))
|
game.pushScreen(DiplomacyScreen(viewingCiv))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user