From de9e9c9127a409318b994758f3043ad631008c11 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 25 Apr 2024 10:45:41 +0300 Subject: [PATCH] Resolved #11408 - MP Spectator can scroll entire map --- .../src/com/unciv/ui/screens/worldscreen/WorldMapHolder.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/ui/screens/worldscreen/WorldMapHolder.kt b/core/src/com/unciv/ui/screens/worldscreen/WorldMapHolder.kt index 1ac4913228..63153ea35d 100644 --- a/core/src/com/unciv/ui/screens/worldscreen/WorldMapHolder.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/WorldMapHolder.kt @@ -959,11 +959,11 @@ class WorldMapHolder( } override fun restrictX(deltaX: Float): Float { - val exploredRegion = worldScreen.viewingCiv.exploredRegion var result = scrollX - deltaX + if (worldScreen.viewingCiv.isSpectator()) return result + val exploredRegion = worldScreen.viewingCiv.exploredRegion if (exploredRegion.shouldRecalculateCoords()) exploredRegion.calculateStageCoords(maxX, maxY) - if (!exploredRegion.shouldRestrictX()) return result val leftX = exploredRegion.getLeftX() @@ -978,9 +978,10 @@ class WorldMapHolder( } override fun restrictY(deltaY: Float): Float { - val exploredRegion = worldScreen.viewingCiv.exploredRegion var result = scrollY + deltaY + if (worldScreen.viewingCiv.isSpectator()) return result + val exploredRegion = worldScreen.viewingCiv.exploredRegion if (exploredRegion.shouldRecalculateCoords()) exploredRegion.calculateStageCoords(maxX, maxY) val topY = exploredRegion.getTopY()