From d733df207fd9e8ea299ec2c4b882b2a4cabecd53 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 29 May 2019 21:44:42 +0300 Subject: [PATCH] Fixed bug that prevented the "next turn" button from being pressed when the game didn't autosave, meaning players who picked turns between autosaves manually were screwed --- core/src/com/unciv/logic/civilization/CivilizationInfo.kt | 1 - core/src/com/unciv/ui/worldscreen/WorldScreen.kt | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index 20835a324d..cdf3810e8d 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -144,7 +144,6 @@ class CivilizationInfo { fun getStatMapForNextTurn(): HashMap { val statMap = HashMap() for (city in cities){ - val statBonuses = Stats() if(!statMap.containsKey("Cities")) statMap["Cities"]=Stats() statMap["Cities"] = statMap["Cities"]!! + city.cityStats.currentCityStats } diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt index 55120e4be0..f6d0c45191 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt @@ -269,6 +269,7 @@ class WorldScreen : CameraStageBaseScreen() { updateNextTurnButton() } } + else nextTurnButton.enable() // Enable immediately // If we put this BEFORE the save game, then we try to save the game... // but the main thread does other stuff, including showing tutorials which guess what? Changes the game data