From 089f8ac49f88c35789e19082f9156382906dde30 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 14 Apr 2019 22:33:19 +0300
Subject: [PATCH] "Map Editor" button now takes the current map to edit

---
 android/build.gradle                                       | 4 ++--
 .../ui/worldscreen/optionstable/WorldScreenMenuTable.kt    | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index f11ecce6bd..3e730eae66 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.app"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 227
-        versionName "2.14.7"
+        versionCode 228
+        versionName "2.14.8"
     }
 
     // Had to add this crap for Travis to build, it wanted to sign the app
diff --git a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenMenuTable.kt b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenMenuTable.kt
index 8047f776d2..be8bb83a8d 100644
--- a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenMenuTable.kt
+++ b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenMenuTable.kt
@@ -15,7 +15,12 @@ class WorldScreenMenuTable(val worldScreen: WorldScreen) : PopupTable(worldScree
 
     init {
         addButton("Map editor".tr()){
-            UnCivGame.Current.screen = MapEditorScreen(null)
+            val tileMapClone = worldScreen.gameInfo.tileMap.clone()
+            for(tile in tileMapClone.values){
+                tile.militaryUnit=null
+                tile.civilianUnit=null
+            }
+            UnCivGame.Current.screen = MapEditorScreen(tileMapClone)
             remove()
         }