From 55659657aaddbf9bf2013fcd6c3014e7358b1995 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 4 Apr 2021 21:03:45 +0300
Subject: [PATCH] World wrap is publicly released!

---
 core/src/com/unciv/models/metadata/GameSettings.kt         | 1 -
 core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt  | 4 +---
 core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt | 4 ----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/core/src/com/unciv/models/metadata/GameSettings.kt b/core/src/com/unciv/models/metadata/GameSettings.kt
index e1d2f0919a..2a3a9bdbb4 100644
--- a/core/src/com/unciv/models/metadata/GameSettings.kt
+++ b/core/src/com/unciv/models/metadata/GameSettings.kt
@@ -39,7 +39,6 @@ class GameSettings {
     var isFreshlyCreated = false
     var visualMods = HashSet<String>()
 
-    var showExperimentalWorldWrap = false
     var showExperimentalTileLayering = false
 
     init {
diff --git a/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt b/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt
index e0ac22ed2d..e843362272 100644
--- a/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt
+++ b/core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt
@@ -32,9 +32,7 @@ class MapParametersTable(val mapParameters: MapParameters, val isEmptyMapAllowed
         addWorldSizeSelectBox()
         addNoRuinsCheckbox()
         addNoNaturalWondersCheckbox()
-        if (UncivGame.Current.settings.showExperimentalWorldWrap) {
-            addWorldWrapCheckbox()
-        }
+        addWorldWrapCheckbox()
         addAdvancedSettings()
     }
 
diff --git a/core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt b/core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt
index eba636e903..f86b705699 100644
--- a/core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt
+++ b/core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt
@@ -128,10 +128,6 @@ class OptionsPopup(val previousScreen:CameraStageBaseScreen) : Popup(previousScr
 
         addHeader("Other options")
 
-        addYesNoRow("Show experimental world wrap for maps\nHIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED!",
-                settings.showExperimentalWorldWrap)
-        { settings.showExperimentalWorldWrap = it }
-
         addYesNoRow("Show experimental tile layering\nHIGHLY EXPERIMENTAL - YOU HAVE BEEN WARNED!",
                 settings.showExperimentalTileLayering)
         { settings.showExperimentalTileLayering = it }