From 95d603a03587fe7b58fd461629c51da4b4eb03e0 Mon Sep 17 00:00:00 2001
From: Olexandr Nesterenko <olexn@ukr.net>
Date: Tue, 14 Apr 2020 17:04:05 +0300
Subject: [PATCH]  Separate the use of map name and player name (#1863)

* change use 'name'

* remove schematic.name
---
 core/src/mindustry/editor/MapInfoDialog.java  | 2 +-
 core/src/mindustry/ui/dialogs/MapsDialog.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/editor/MapInfoDialog.java b/core/src/mindustry/editor/MapInfoDialog.java
index ab120c9880..743dcbb9af 100644
--- a/core/src/mindustry/editor/MapInfoDialog.java
+++ b/core/src/mindustry/editor/MapInfoDialog.java
@@ -32,7 +32,7 @@ public class MapInfoDialog extends FloatingDialog{
         ObjectMap<String, String> tags = editor.getTags();
         
         cont.pane(t -> {
-            t.add("$editor.name").padRight(8).left();
+            t.add("$editor.mapname").padRight(8).left();
             t.defaults().padTop(15);
 
             TextField name = t.addField(tags.get("name", ""), text -> {
diff --git a/core/src/mindustry/ui/dialogs/MapsDialog.java b/core/src/mindustry/ui/dialogs/MapsDialog.java
index 9324734064..cefe2729d1 100644
--- a/core/src/mindustry/ui/dialogs/MapsDialog.java
+++ b/core/src/mindustry/ui/dialogs/MapsDialog.java
@@ -51,7 +51,7 @@ public class MapsDialog extends FloatingDialog{
         }
 
         buttons.addImageTextButton("$editor.newmap", Icon.add, () -> {
-            ui.showTextInput("$editor.newmap", "$name", "", text -> {
+            ui.showTextInput("$editor.newmap", "$editor.mapname", "", text -> {
                 Runnable show = () -> ui.loadAnd(() -> {
                     hide();
                     ui.editor.show();
@@ -177,7 +177,7 @@ public class MapsDialog extends FloatingDialog{
             t.top();
             t.defaults().padTop(10).left();
 
-            t.add("$editor.name").padRight(10).color(Color.gray).padTop(0);
+            t.add("$editor.mapname").padRight(10).color(Color.gray).padTop(0);
             t.row();
             t.add(map.name()).growX().wrap().padTop(2);
             t.row();