mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-21 21:30:20 +07:00
Code Issues Packages Projects Releases Wiki Activity

Disabled autosave when resizing worldScreen

Browse Source
This commit is contained in:
Yair Morgenstern
2022-07-21 22:31:44 +03:00
parent 96c9d105f3
commit 77b0b582ae
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,6 @@ import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.ui.cityscreen.CityScreen import com.unciv.ui.cityscreen.CityScreen
import com.unciv.ui.civilopedia.CivilopediaScreen import com.unciv.ui.civilopedia.CivilopediaScreen
import com.unciv.ui.images.ImageGetter import com.unciv.ui.images.ImageGetter
import com.unciv.ui.multiplayer.MultiplayerHelpers
import com.unciv.ui.overviewscreen.EmpireOverviewScreen import com.unciv.ui.overviewscreen.EmpireOverviewScreen
import com.unciv.ui.pickerscreens.DiplomaticVotePickerScreen import com.unciv.ui.pickerscreens.DiplomaticVotePickerScreen
import com.unciv.ui.pickerscreens.DiplomaticVoteResultScreen import com.unciv.ui.pickerscreens.DiplomaticVoteResultScreen
@ -748,7 +747,7 @@ class WorldScreen(
override fun resize(width: Int, height: Int) { override fun resize(width: Int, height: Int) {
if (stage.viewport.screenWidth != width || stage.viewport.screenHeight != height) { if (stage.viewport.screenWidth != width || stage.viewport.screenHeight != height) {
startNewScreenJob(gameInfo) // start over startNewScreenJob(gameInfo, true) // start over
} }
} }
@ -826,7 +825,7 @@ class WorldScreen(
} }
/** This exists so that no reference to the current world screen remains, so the old world screen can get garbage collected during [UncivGame.loadGame]. */ /** This exists so that no reference to the current world screen remains, so the old world screen can get garbage collected during [UncivGame.loadGame]. */
private fun startNewScreenJob(gameInfo: GameInfo) { private fun startNewScreenJob(gameInfo: GameInfo, autosaveDisabled:Boolean = false) {
Concurrency.run { Concurrency.run {
val newWorldScreen = try { val newWorldScreen = try {
UncivGame.Current.loadGame(gameInfo) UncivGame.Current.loadGame(gameInfo)
@ -838,7 +837,8 @@ private fun startNewScreenJob(gameInfo: GameInfo) {
return@run return@run
} }
val shouldAutoSave = gameInfo.turns % UncivGame.Current.settings.turnsBetweenAutosaves == 0 val shouldAutoSave = !autosaveDisabled
&& gameInfo.turns % UncivGame.Current.settings.turnsBetweenAutosaves == 0
if (shouldAutoSave) { if (shouldAutoSave) {
newWorldScreen.autoSave() newWorldScreen.autoSave()
} }