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

Fix new game Mod nation icons on first open (#5334)

Browse Source
This commit is contained in:
SomeTroglodyte 2021-09-27 16:28:26 +02:00 committed by GitHub
parent e0e701058d
commit a487c2c373
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt
View File

@ -28,23 +28,24 @@ class NewGameScreen(
override val gameSetupInfo = _gameSetupInfo ?: GameSetupInfo.fromSettings() override val gameSetupInfo = _gameSetupInfo ?: GameSetupInfo.fromSettings()
override var ruleset = RulesetCache.getComplexRuleset(gameSetupInfo.gameParameters.mods) // needs to be set because the GameOptionsTable etc. depend on this override var ruleset = RulesetCache.getComplexRuleset(gameSetupInfo.gameParameters.mods) // needs to be set because the GameOptionsTable etc. depend on this
private val newGameOptionsTable = GameOptionsTable(this, isNarrowerThan4to3()) { desiredCiv: String -> playerPickerTable.update(desiredCiv) } private val newGameOptionsTable: GameOptionsTable
private val playerPickerTable: PlayerPickerTable
// Has to be defined before the mapOptionsTable, since the mapOptionsTable refers to it on init private val mapOptionsTable: MapOptionsTable
private val playerPickerTable = PlayerPickerTable(
this, gameSetupInfo.gameParameters,
if (isNarrowerThan4to3()) stage.width - 20f else 0f
)
private val mapOptionsTable = MapOptionsTable(this)
init { init {
updateRuleset() // must come before playerPickerTable so mod nations from fromSettings
// Has to be initialized before the mapOptionsTable, since the mapOptionsTable refers to it on init
playerPickerTable = PlayerPickerTable(
this, gameSetupInfo.gameParameters,
if (isNarrowerThan4to3()) stage.width - 20f else 0f
)
newGameOptionsTable = GameOptionsTable(this, isNarrowerThan4to3()) { desiredCiv: String -> playerPickerTable.update(desiredCiv) }
mapOptionsTable = MapOptionsTable(this)
setDefaultCloseAction(previousScreen) setDefaultCloseAction(previousScreen)
if (isNarrowerThan4to3()) initPortrait() if (isNarrowerThan4to3()) initPortrait()
else initLandscape() else initLandscape()
updateRuleset()
if (UncivGame.Current.settings.lastGameSetup != null) { if (UncivGame.Current.settings.lastGameSetup != null) {
rightSideGroup.addActorAt(0, VerticalGroup().padBottom(5f)) rightSideGroup.addActorAt(0, VerticalGroup().padBottom(5f))
val resetToDefaultsButton = "Reset to defaults".toTextButton() val resetToDefaultsButton = "Reset to defaults".toTextButton()