mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-13 17:28:57 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed modded images not loading properly

Browse Source
This commit is contained in:
Yair Morgenstern
2020-09-25 13:50:02 +03:00
parent 98a79f8fb4
commit 009c59b77c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,9 +118,9 @@ class UncivGame(parameters: UncivGameParameters) : Game() {
fun loadGame(gameInfo: GameInfo) { fun loadGame(gameInfo: GameInfo) {
this.gameInfo = gameInfo this.gameInfo = gameInfo
ImageGetter.ruleset = gameInfo.ruleSet ImageGetter.ruleset = gameInfo.ruleSet
ImageGetter.reload()
Gdx.input.inputProcessor = null // Since we will set the world screen when we're ready, Gdx.input.inputProcessor = null // Since we will set the world screen when we're ready,
// This is to avoid ANRs when loading. // This is to avoid ANRs when loading.
//ImageGetter.refreshAtlas()
worldScreen = WorldScreen(gameInfo.getPlayerToViewAs()) worldScreen = WorldScreen(gameInfo.getPlayerToViewAs())
setWorldScreen() setWorldScreen()
} }

2
core/src/com/unciv/ui/newgamescreen/GameOptionsTable.kt
View File

@ -174,7 +174,7 @@ class GameOptionsTable(val previousScreen: IPreviousScreen, val updatePlayerPick
ruleset.modOptions = newRuleset.modOptions ruleset.modOptions = newRuleset.modOptions
ImageGetter.ruleset = ruleset ImageGetter.ruleset = ruleset
ImageGetter.setTextureRegionDrawables() ImageGetter.reload()
} }
fun Table.addModCheckboxes() { fun Table.addModCheckboxes() {

8
core/src/com/unciv/ui/utils/ImageGetter.kt
View File

@ -36,17 +36,17 @@ object ImageGetter {
val textureRegionDrawables = HashMap<String,TextureRegionDrawable>() val textureRegionDrawables = HashMap<String,TextureRegionDrawable>()
init{ init{
setTextureRegionDrawables() reload()
} }
fun setNewRuleset(ruleset: Ruleset) { fun setNewRuleset(ruleset: Ruleset) {
if (this.ruleset == ruleset) return if (this.ruleset == ruleset) return
this.ruleset = ruleset this.ruleset = ruleset
setTextureRegionDrawables() reload()
} }
/** Required every time the ruleset changes, in order to load mod-specific images */
fun setTextureRegionDrawables(){ fun reload(){
textureRegionDrawables.clear() textureRegionDrawables.clear()
// These are the drawables from the base game // These are the drawables from the base game
for(region in atlas.regions){ for(region in atlas.regions){