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

Resolved #10375 - ALWAYS reload images when loading

Browse Source 
There were cases where the images would be changed out (in new game screen / mod screen) which led to reloading the same game causing missing images
This commit is contained in:
yairm210 2024-07-08 17:00:30 +03:00
parent df96526f1e
commit aee34de2f4
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -193,7 +193,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci
throw UncivShowableException("You are not allowed to spectate!") throw UncivShowableException("You are not allowed to spectate!")
} }
initializeResources(prevGameInfo, newGameInfo) initializeResources(newGameInfo)
val isLoadingSameGame = worldScreen != null && prevGameInfo != null && prevGameInfo.gameId == newGameInfo.gameId val isLoadingSameGame = worldScreen != null && prevGameInfo != null && prevGameInfo.gameId == newGameInfo.gameId
val worldScreenRestoreState = if (!callFromLoadScreen && isLoadingSameGame) worldScreen!!.getRestoreState() else null val worldScreenRestoreState = if (!callFromLoadScreen && isLoadingSameGame) worldScreen!!.getRestoreState() else null
@ -232,16 +232,12 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci
} }
/** The new game info may have different mods or rulesets, which may use different resources that need to be loaded. */ /** The new game info may have different mods or rulesets, which may use different resources that need to be loaded. */
private suspend fun initializeResources(prevGameInfo: GameInfo?, newGameInfo: GameInfo) { private suspend fun initializeResources(newGameInfo: GameInfo) {
if (prevGameInfo == null withGLContext {
|| prevGameInfo.gameParameters.baseRuleset != newGameInfo.gameParameters.baseRuleset ImageGetter.setNewRuleset(newGameInfo.ruleset)
|| prevGameInfo.gameParameters.mods != newGameInfo.gameParameters.mods) {
withGLContext {
ImageGetter.setNewRuleset(newGameInfo.ruleset)
}
val fullModList = newGameInfo.gameParameters.getModsAndBaseRuleset()
musicController.setModList(fullModList)
} }
val fullModList = newGameInfo.gameParameters.getModsAndBaseRuleset()
musicController.setModList(fullModList)
} }
/** Re-creates the current [worldScreen], if there is any. */ /** Re-creates the current [worldScreen], if there is any. */