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

New players are correctly send to the language screen

Browse Source
This commit is contained in:
Yair Morgenstern 2020-04-20 23:21:52 +03:00
parent a3a9bd142e
commit eaf7c0a150
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/unciv/UncivGame.kt
View File

@ -94,7 +94,10 @@ class UncivGame(
CameraStageBaseScreen.resetFonts() CameraStageBaseScreen.resetFonts()
thread(name="Music") { startMusic() } thread(name="Music") { startMusic() }
restoreSize() restoreSize()
setScreen(MenuScreen())
if (settings.isFreshlyCreated) {
setScreen(LanguagePickerScreen())
} else { setScreen(MenuScreen()) }
isInitialized = true isInitialized = true
} }
} }
@ -207,9 +210,6 @@ class MenuScreen:CameraStageBaseScreen() {
} }
init { init {
if (game.settings.isFreshlyCreated) {
game.setScreen(LanguagePickerScreen(this))
} else {
val table = Table().apply { defaults().pad(10f) } val table = Table().apply { defaults().pad(10f) }
val autosaveGame = GameSaver.getSave(autosave, false) val autosaveGame = GameSaver.getSave(autosave, false)
if (autosaveGame.exists()) { if (autosaveGame.exists()) {
@ -236,7 +236,6 @@ class MenuScreen:CameraStageBaseScreen() {
table.center(stage) table.center(stage)
stage.addActor(table) stage.addActor(table)
} }
}
fun autoLoadGame() { fun autoLoadGame() {
try { try {

5
core/src/com/unciv/ui/LanguagePickerScreen.kt
View File

@ -3,6 +3,7 @@ package com.unciv.ui
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Touchable import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.unciv.MenuScreen
import com.unciv.UncivGame import com.unciv.UncivGame
import com.unciv.models.translations.tr import com.unciv.models.translations.tr
import com.unciv.ui.pickerscreens.PickerScreen import com.unciv.ui.pickerscreens.PickerScreen
@ -32,7 +33,7 @@ class LanguageTable(val language:String, val percentComplete: Int):Table(){
} }
class LanguagePickerScreen(val previousScreen: CameraStageBaseScreen): PickerScreen(){ class LanguagePickerScreen(): PickerScreen(){
var chosenLanguage = "English" var chosenLanguage = "English"
private val languageTables = ArrayList<LanguageTable>() private val languageTables = ArrayList<LanguageTable>()
@ -80,7 +81,7 @@ class LanguagePickerScreen(val previousScreen: CameraStageBaseScreen): PickerScr
game.translations.tryReadTranslationForCurrentLanguage() game.translations.tryReadTranslationForCurrentLanguage()
resetFonts() resetFonts()
game.setScreen(previousScreen) game.setScreen(MenuScreen())
dispose() dispose()
} }
} }