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

Fixed bug where game would crash if you ordered a unit to go womewhere that it can't reach (now it just ignores you entirely)

Browse source
This commit is contained in:
Yair Morgenstern 2018-05-07 23:48:25 +03:00
parent 8b748384af
commit 602532b721
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Label
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.unciv.logic.map.MapUnit
import com.unciv.logic.map.TileInfo
import com.unciv.logic.map.UnitMovementAlgorithms
import com.unciv.logic.map.UnitType
import com.unciv.ui.utils.CameraStageBaseScreen
import com.unciv.ui.utils.ImageGetter
@ -64,6 +65,11 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
fun tileSelected(selectedTile: TileInfo) {
if(currentlyExecutingAction=="moveTo"){
if(UnitMovementAlgorithms(selectedTile.tileMap)
.getShortestPath(selectedTile.position, selectedTile.position, selectedUnit!!).isEmpty())
return // can't reach there with the selected unit, watcha want me to do?
val reachedTile = selectedUnit!!.headTowards(selectedTile.position)
if(reachedTile!=selectedTile) // Didn't get all the way there