wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved autosave to a concurrent thread so you won't have to wait for it to finish saving to continue your game

Browse source 
UpdateTiles is now cleaner - doesn't update viewed tiles twice, only once
This commit is contained in:
Yair Morgenstern 2018-05-29 12:26:43 +03:00
parent 14a1bc5626
commit 36f9ba6f8c
3 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core/src/com/unciv/ui/worldscreen/TileMapHolder.kt
View file

@ -85,27 +85,20 @@ class TileMapHolder(internal val worldScreen: WorldScreen, internal val tileMap:
} }
internal fun updateTiles() { internal fun updateTiles() {
val civViewableTiles = civInfo.getViewableTiles().toHashSet()
for (WG in tileGroups.values){ for (WG in tileGroups.values){
WG.update(false) WG.update(civViewableTiles.contains(WG.tileInfo))
}
val civViewableTiles = civInfo.getViewableTiles()
for (string in civViewableTiles
.filter { tileGroups.containsKey(it) }) {
tileGroups[string]!!.run {
update(true)
}
} }
if(worldScreen.bottomBar.unitTable.selectedUnit!=null){ if(worldScreen.bottomBar.unitTable.selectedUnit!=null){
val unit = worldScreen.bottomBar.unitTable.selectedUnit!! val unit = worldScreen.bottomBar.unitTable.selectedUnit!!
tileGroups[unit.getTile()]!!.addWhiteHaloAroundUnit() tileGroups[unit.getTile()]!!.addWhiteHaloAroundUnit()
val attackableTiles:List<TileInfo>
when(unit.getBaseUnit().unitType){ val attackableTiles: List<TileInfo> = when(unit.getBaseUnit().unitType){
UnitType.Civilian -> attackableTiles = listOf() UnitType.Civilian -> listOf()
UnitType.Melee, UnitType.Mounted -> attackableTiles = unit.getDistanceToTiles().keys.toList() UnitType.Melee, UnitType.Mounted -> unit.getDistanceToTiles().keys.toList()
UnitType.Archery, UnitType.Siege -> attackableTiles = unit.getTile().getTilesInDistance(2) UnitType.Archery, UnitType.Siege -> unit.getTile().getTilesInDistance(2)
UnitType.City -> throw Exception("A unit shouldn't have a City unittype!") UnitType.City -> throw Exception("A unit shouldn't have a City unittype!")
} }

2
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View file

@ -115,7 +115,7 @@ class WorldScreen : CameraStageBaseScreen() {
game.gameInfo.nextTurn() game.gameInfo.nextTurn()
bottomBar.unitTable.currentlyExecutingAction = null bottomBar.unitTable.currentlyExecutingAction = null
GameSaver.saveGame(game.gameInfo, "Autosave") kotlin.concurrent.thread { GameSaver.saveGame(game.gameInfo, "Autosave") }
update() update()
displayTutorials("NextTurn") displayTutorials("NextTurn")

1
core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt
View file

@ -60,7 +60,6 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
unitDescriptionLabel.setText(unitLabelText) unitDescriptionLabel.setText(unitLabelText)
} }
else { else {
unitNameLabel.setText("") unitNameLabel.setText("")