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

Resolved #11408 - MP Spectator can scroll entire map

Browse Source
This commit is contained in:
Yair Morgenstern
2024-04-25 10:45:41 +03:00
parent a58e09f621
commit de9e9c9127
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/com/unciv/ui/screens/worldscreen/WorldMapHolder.kt
View File

@ -959,11 +959,11 @@ class WorldMapHolder(
} }
override fun restrictX(deltaX: Float): Float { override fun restrictX(deltaX: Float): Float {
val exploredRegion = worldScreen.viewingCiv.exploredRegion
var result = scrollX - deltaX var result = scrollX - deltaX
if (worldScreen.viewingCiv.isSpectator()) return result
val exploredRegion = worldScreen.viewingCiv.exploredRegion
if (exploredRegion.shouldRecalculateCoords()) exploredRegion.calculateStageCoords(maxX, maxY) if (exploredRegion.shouldRecalculateCoords()) exploredRegion.calculateStageCoords(maxX, maxY)
if (!exploredRegion.shouldRestrictX()) return result if (!exploredRegion.shouldRestrictX()) return result
val leftX = exploredRegion.getLeftX() val leftX = exploredRegion.getLeftX()
@ -978,9 +978,10 @@ class WorldMapHolder(
} }
override fun restrictY(deltaY: Float): Float { override fun restrictY(deltaY: Float): Float {
val exploredRegion = worldScreen.viewingCiv.exploredRegion
var result = scrollY + deltaY var result = scrollY + deltaY
if (worldScreen.viewingCiv.isSpectator()) return result
val exploredRegion = worldScreen.viewingCiv.exploredRegion
if (exploredRegion.shouldRecalculateCoords()) exploredRegion.calculateStageCoords(maxX, maxY) if (exploredRegion.shouldRecalculateCoords()) exploredRegion.calculateStageCoords(maxX, maxY)
val topY = exploredRegion.getTopY() val topY = exploredRegion.getTopY()