From 2a74be3be24ec23c8fd3cf8e55447adb51772b42 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 13 Mar 2023 19:45:39 +0200 Subject: [PATCH] 4.5.7-patch1 Resolved #8883 --- buildSrc/src/main/kotlin/BuildConfig.kt | 4 ++-- core/src/com/unciv/UncivGame.kt | 2 +- .../unciv/ui/screens/worldscreen/minimap/MinimapTileUtil.kt | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt index 19e8691dc7..cb10af7d6f 100644 --- a/buildSrc/src/main/kotlin/BuildConfig.kt +++ b/buildSrc/src/main/kotlin/BuildConfig.kt @@ -3,8 +3,8 @@ package com.unciv.build object BuildConfig { const val kotlinVersion = "1.8.0" const val appName = "Unciv" - const val appCodeNumber = 830 - const val appVersion = "4.5.7" + const val appCodeNumber = 831 + const val appVersion = "4.5.7-patch1" const val gdxVersion = "1.11.0" const val roboVMVersion = "2.3.1" diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt index f7482bb9c0..8e2aa7a381 100644 --- a/core/src/com/unciv/UncivGame.kt +++ b/core/src/com/unciv/UncivGame.kt @@ -529,7 +529,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci companion object { //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT - val VERSION = Version("4.5.7", 830) + val VERSION = Version("4.5.7-patch1", 831) //endregion lateinit var Current: UncivGame diff --git a/core/src/com/unciv/ui/screens/worldscreen/minimap/MinimapTileUtil.kt b/core/src/com/unciv/ui/screens/worldscreen/minimap/MinimapTileUtil.kt index f0fbf6b613..76242c5e9b 100644 --- a/core/src/com/unciv/ui/screens/worldscreen/minimap/MinimapTileUtil.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/minimap/MinimapTileUtil.kt @@ -1,13 +1,13 @@ package com.unciv.ui.screens.worldscreen.minimap +import com.badlogic.gdx.math.Rectangle import com.badlogic.gdx.scenes.scene2d.Group -import java.awt.geom.Rectangle2D import kotlin.math.max import kotlin.math.min object MinimapTileUtil { - fun spreadOutMinimapTiles(tileLayer: Group, tiles: List, tileSize: Float) : Rectangle2D.Float { + fun spreadOutMinimapTiles(tileLayer: Group, tiles: List, tileSize: Float) : Rectangle { var topX = -Float.MAX_VALUE var topY = -Float.MAX_VALUE var bottomX = Float.MAX_VALUE @@ -23,6 +23,6 @@ object MinimapTileUtil { bottomY = min(bottomY, image.y) } - return Rectangle2D.Float(bottomX, bottomY, topX-bottomX, topY-bottomY) + return Rectangle(bottomX, bottomY, topX-bottomX, topY-bottomY) } }