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

Images are restored to ruleset correctly when resuming open game screen

Browse Source
This commit is contained in:
yairm210
2024-09-15 12:22:12 +03:00
parent 29e6b4a720
commit b71b9db197
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,7 +245,6 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci
} }
val fullModList = newGameInfo.gameParameters.getModsAndBaseRuleset() val fullModList = newGameInfo.gameParameters.getModsAndBaseRuleset()
musicController.setModList(fullModList) musicController.setModList(fullModList)
settings.tileSet
} }
/** Re-creates the current [worldScreen], if there is any. */ /** Re-creates the current [worldScreen], if there is any. */

2
core/src/com/unciv/ui/screens/mainmenuscreen/MainMenuScreen.kt
View File

@ -287,7 +287,7 @@ class MainMenuScreen: BaseScreen(), RecreateOnResize {
} else { } else {
GUI.resetToWorldScreen() GUI.resetToWorldScreen()
GUI.getWorldScreen().popups.filterIsInstance<WorldScreenMenuPopup>().forEach(Popup::close) GUI.getWorldScreen().popups.filterIsInstance<WorldScreenMenuPopup>().forEach(Popup::close)
ImageGetter.ruleset = game.gameInfo!!.ruleset ImageGetter.setNewRuleset(game.gameInfo!!.ruleset)
} }
} else { } else {
QuickSave.autoLoadGame(this) QuickSave.autoLoadGame(this)