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

Remove unnecessary try catch block. (#2869)

Browse Source
This commit is contained in:
Alexander Korolyov 2020-07-22 05:29:12 +02:00 committed by GitHub
parent aa2f9726ac
commit 1c613ac274
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/com/unciv/logic/GameSaver.kt
View File

@ -3,6 +3,7 @@ package com.unciv.logic
import com.badlogic.gdx.Gdx import com.badlogic.gdx.Gdx
import com.badlogic.gdx.files.FileHandle import com.badlogic.gdx.files.FileHandle
import com.badlogic.gdx.utils.Json import com.badlogic.gdx.utils.Json
import com.unciv.UncivGame
import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.models.metadata.GameSettings import com.unciv.models.metadata.GameSettings
import com.unciv.ui.utils.ImageGetter import com.unciv.ui.utils.ImageGetter
@ -57,11 +58,8 @@ object GameSaver {
} }
fun getGeneralSettingsFile(): FileHandle { fun getGeneralSettingsFile(): FileHandle {
try { return if (UncivGame.Current.consoleMode) FileHandle(settingsFileName)
return Gdx.files.local(settingsFileName) else Gdx.files.local(settingsFileName)
} catch (ex: NullPointerException) {
return FileHandle(settingsFileName)
}
} }
fun getGeneralSettings(): GameSettings { fun getGeneralSettings(): GameSettings {

5
desktop/src/com/unciv/app/desktop/ConsoleLauncher.kt
View File

@ -35,7 +35,10 @@ internal object ConsoleLauncher {
val game = UncivGame(consoleParameters) val game = UncivGame(consoleParameters)
UncivGame.Current = game UncivGame.Current = game
UncivGame.Current.settings = GameSettings().apply { showTutorials = false } UncivGame.Current.settings = GameSettings().apply {
showTutorials = false
turnsBetweenAutosaves = 10000
}
RulesetCache.loadRulesets(true) RulesetCache.loadRulesets(true)