AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 06:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

We now try to load the last tturn-autosave whn loading the regular autosaves failed (e.g. when the save file is corrupt)

Browse Source
This commit is contained in:
Yair Morgenstern 2020-11-14 22:58:05 +02:00
parent 89751ca6ec
commit 9b2c1b2ace
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/com/unciv/MainMenuScreen.kt
View File

@ -6,6 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.actions.Actions import com.badlogic.gdx.scenes.scene2d.actions.Actions
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.utils.SerializationException
import com.unciv.logic.GameInfo import com.unciv.logic.GameInfo
import com.unciv.logic.GameSaver import com.unciv.logic.GameSaver
import com.unciv.logic.GameStarter import com.unciv.logic.GameStarter
@ -166,15 +167,20 @@ class MainMenuScreen: CameraStageBaseScreen() {
private fun autoLoadGame() { private fun autoLoadGame() {
ToastPopup("Loading...", this) ToastPopup("Loading...", this)
thread { // Load game from file to class on separate thread to avoid ANR... thread { // Load game from file to class on separate thread to avoid ANR...
val savedGame: GameInfo var savedGame: GameInfo
try { try {
savedGame = GameSaver.loadGameByName(autosave) savedGame = GameSaver.loadGameByName(autosave)
} catch (outOfMemory: OutOfMemoryError) { } catch (outOfMemory: OutOfMemoryError) {
ToastPopup("Not enough memory on phone to load game!", this) ToastPopup("Not enough memory on phone to load game!", this)
return@thread return@thread
} catch (ex: Exception) { // silent fail if we can't read the autosave for any reason } catch (ex: Exception) { // silent fail if we can't read the autosave for any reason - try to load the last autosave by turn number first
ToastPopup("Cannot resume game!", this) try {
return@thread val autosaves = GameSaver.getSaves().filter { it.name() != autosave && it.name().startsWith(autosave) }
savedGame = GameSaver.loadGameFromFile(autosaves.maxBy { it.lastModified() }!!)
} catch (ex: Exception) {
ToastPopup("Cannot resume game!", this)
return@thread
}
} }
Gdx.app.postRunnable { /// ... and load it into the screen on main thread for GL context Gdx.app.postRunnable { /// ... and load it into the screen on main thread for GL context