From 7e36d62b6e1bda37562f1882e11829d5762d1416 Mon Sep 17 00:00:00 2001 From: Azzurite Date: Wed, 22 Jun 2022 10:00:17 +0200 Subject: [PATCH] Fix crash --- core/src/com/unciv/UncivGame.kt | 1 + .../com/unciv/ui/worldscreen/TechPolicyDiplomacyButtons.kt | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index b8dd095c02..2004df5f98 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -235,6 +235,7 @@ class UncivGame(parameters: UncivGameParameters) : Game() { /** * @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) { throw UnsupportedOperationException("Use pushScreen or replaceCurrentScreen instead") } diff --git a/core/src/com/unciv/ui/worldscreen/TechPolicyDiplomacyButtons.kt b/core/src/com/unciv/ui/worldscreen/TechPolicyDiplomacyButtons.kt index 54f78f963c..956fd59400 100644 --- a/core/src/com/unciv/ui/worldscreen/TechPolicyDiplomacyButtons.kt +++ b/core/src/com/unciv/ui/worldscreen/TechPolicyDiplomacyButtons.kt @@ -44,17 +44,17 @@ class TechPolicyDiplomacyButtons(val worldScreen: WorldScreen) : Table(BaseScree pickTechButton.defaults().pad(20f) pickTechButton.add(pickTechLabel) techButtonHolder.onClick(UncivSound.Paper) { - game.setScreen(TechPickerScreen(viewingCiv)) + game.pushScreen(TechPickerScreen(viewingCiv)) } policyScreenButton.add(ImageGetter.getImage("PolicyIcons/Constitution")).size(30f).pad(15f) policyButtonHolder.onClick { - game.setScreen(PolicyPickerScreen(worldScreen)) + game.pushScreen(PolicyPickerScreen(worldScreen)) } diplomacyButton.add(ImageGetter.getImage("OtherIcons/DiplomacyW")).size(30f).pad(15f) diplomacyButtonHolder.onClick { - game.setScreen(DiplomacyScreen(viewingCiv)) + game.pushScreen(DiplomacyScreen(viewingCiv)) } }