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

Caught exception when map fails to load

Browse Source
This commit is contained in:
Yair Morgenstern 2021-05-13 21:43:42 +03:00
parent d92e9a1dc7
commit d546b2b00e
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/assets/jsons/translations/template.properties
View File

@ -198,6 +198,7 @@ Game Options =
Civilizations = Civilizations =
Map Type = Map Type =
Map file = Map file =
Could not load map! =
Generated = Generated =
Existing = Existing =
Custom = Custom =

14
core/src/com/unciv/ui/newgamescreen/MapOptionsTable.kt
View File

@ -7,7 +7,9 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.utils.Array import com.badlogic.gdx.utils.Array
import com.unciv.logic.MapSaver import com.unciv.logic.MapSaver
import com.unciv.logic.map.MapType import com.unciv.logic.map.MapType
import com.unciv.logic.map.TileMap
import com.unciv.ui.utils.CameraStageBaseScreen import com.unciv.ui.utils.CameraStageBaseScreen
import com.unciv.ui.utils.Popup
import com.unciv.ui.utils.onChange import com.unciv.ui.utils.onChange
import com.unciv.ui.utils.toLabel import com.unciv.ui.utils.toLabel
@ -89,9 +91,19 @@ class MapOptionsTable(val newGameScreen: NewGameScreen): Table() {
mapFileSelectBox.onChange { mapFileSelectBox.onChange {
val mapFile = mapFileSelectBox.selected.fileHandle val mapFile = mapFileSelectBox.selected.fileHandle
val map: TileMap
try {
map = MapSaver.loadMap(mapFile)
} catch (ex:Exception){
Popup(newGameScreen).apply {
addGoodSizedLabel("Could not load map!")
addCloseButton()
open()
}
return@onChange
}
mapParameters.name = mapFile.name() mapParameters.name = mapFile.name()
newGameScreen.gameSetupInfo.mapFile = mapFile newGameScreen.gameSetupInfo.mapFile = mapFile
val map = MapSaver.loadMap(mapFile)
newGameScreen.gameSetupInfo.gameParameters.mods = map.mapParameters.mods newGameScreen.gameSetupInfo.gameParameters.mods = map.mapParameters.mods
newGameScreen.updateRuleset() newGameScreen.updateRuleset()
newGameScreen.updateTables() newGameScreen.updateTables()