mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-21 05:09:25 +07:00
Code Issues Packages Projects Releases Wiki Activity

Minor bugfix

Browse Source
This commit is contained in:
Yair Morgenstern
2018-10-02 00:00:33 +03:00
parent 47a61ccb29
commit 5beac5cd03
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
View File

@ -146,6 +146,8 @@ class UnitMovementAlgorithms(val unit:MapUnit) {
} }
} else { // If the tile is far away, we need to build a path how to get there, and then take the first step } else { // If the tile is far away, we need to build a path how to get there, and then take the first step
val path = getShortestPath(destination) val path = getShortestPath(destination)
class UnreachableDestinationException:Exception()
if(path.isEmpty()) throw UnreachableDestinationException()
destinationTileThisTurn = path.first() destinationTileThisTurn = path.first()
} }

8
core/src/com/unciv/ui/worldscreen/TileMapHolder.kt
View File

@ -61,9 +61,11 @@ class TileMapHolder(internal val worldScreen: WorldScreen, internal val tileMap:
if(selectedUnit.currentMovement>0) if(selectedUnit.currentMovement>0)
moveHereGroup.onClick { moveHereGroup.onClick {
selectedUnit.movementAlgs().headTowards(tileInfo) if(selectedUnit.movementAlgs().canReach(tileInfo)) {
if(selectedUnit.currentTile != tileInfo) selectedUnit.movementAlgs().headTowards(tileInfo)
selectedUnit.action = "moveTo " + tileInfo.position.x.toInt() + "," + tileInfo.position.y.toInt() if (selectedUnit.currentTile != tileInfo)
selectedUnit.action = "moveTo " + tileInfo.position.x.toInt() + "," + tileInfo.position.y.toInt()
}
worldScreen.update() worldScreen.update()
overlayActor!!.remove() overlayActor!!.remove()