Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Separate the use of map name and player name (#1863)

Browse Source 
* change use 'name'

* remove schematic.name
This commit is contained in:
Olexandr Nesterenko
2020-04-14 17:04:05 +03:00
committed by GitHub
parent 25bc6ebaf0
commit 95d603a035
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/editor/MapInfoDialog.java
View File

@@ -32,7 +32,7 @@ public class MapInfoDialog extends FloatingDialog{
ObjectMap<String, String> tags = editor.getTags(); ObjectMap<String, String> tags = editor.getTags();
cont.pane(t -> { cont.pane(t -> {
t.add("$editor.name").padRight(8).left(); t.add("$editor.mapname").padRight(8).left();
t.defaults().padTop(15); t.defaults().padTop(15);
TextField name = t.addField(tags.get("name", ""), text -> { TextField name = t.addField(tags.get("name", ""), text -> {

4
core/src/mindustry/ui/dialogs/MapsDialog.java
View File

@@ -51,7 +51,7 @@ public class MapsDialog extends FloatingDialog{
} }
buttons.addImageTextButton("$editor.newmap", Icon.add, () -> { buttons.addImageTextButton("$editor.newmap", Icon.add, () -> {
ui.showTextInput("$editor.newmap", "$name", "", text -> { ui.showTextInput("$editor.newmap", "$editor.mapname", "", text -> {
Runnable show = () -> ui.loadAnd(() -> { Runnable show = () -> ui.loadAnd(() -> {
hide(); hide();
ui.editor.show(); ui.editor.show();
@@ -177,7 +177,7 @@ public class MapsDialog extends FloatingDialog{
t.top(); t.top();
t.defaults().padTop(10).left(); 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.row();
t.add(map.name()).growX().wrap().padTop(2); t.add(map.name()).growX().wrap().padTop(2);
t.row(); t.row();