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

Fixed 'unlocks' dialog entries

Browse Source
This commit is contained in:
Anuken
2019-01-21 22:29:50 -05:00
parent ee9a2ee03d
commit 72d7c1ba54
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/core/UI.java
View File

@@ -64,7 +64,7 @@ public class UI implements ApplicationListener{
public TraceDialog traces; public TraceDialog traces;
public ChangelogDialog changelog; public ChangelogDialog changelog;
public LocalPlayerDialog localplayers; public LocalPlayerDialog localplayers;
public DatabaseDialog unlocks; public DatabaseDialog database;
public ContentInfoDialog content; public ContentInfoDialog content;
public DeployDialog deploy; public DeployDialog deploy;
public TechTreeDialog tech; public TechTreeDialog tech;
@@ -165,7 +165,7 @@ public class UI implements ApplicationListener{
load = new LoadDialog(); load = new LoadDialog();
levels = new CustomGameDialog(); levels = new CustomGameDialog();
language = new LanguageDialog(); language = new LanguageDialog();
unlocks = new DatabaseDialog(); database = new DatabaseDialog();
settings = new SettingsMenuDialog(); settings = new SettingsMenuDialog();
host = new HostDialog(); host = new HostDialog();
paused = new PausedDialog(); paused = new PausedDialog();

2
core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
View File

@@ -40,7 +40,7 @@ public class PausedDialog extends FloatingDialog{
cont.addButton("$back", this::hide).colspan(2).width(dw*2 + 20f); cont.addButton("$back", this::hide).colspan(2).width(dw*2 + 20f);
cont.row(); cont.row();
cont.addButton("$unlocks", ui.unlocks::show); cont.addButton("database", ui.database::show);
cont.addButton("$settings", ui.settings::show); cont.addButton("$settings", ui.settings::show);
if(!world.isZone()){ if(!world.isZone()){

2
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
View File

@@ -87,7 +87,7 @@ public class HudFragment extends Fragment{
ui.chatfrag.toggle(); ui.chatfrag.toggle();
} }
}else{ }else{
ui.unlocks.show(); ui.database.show();
} }
}).update(i -> { }).update(i -> {
if(Net.active() && mobile){ if(Net.active() && mobile){

2
core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
View File

@@ -62,7 +62,7 @@ public class MenuFragment extends Fragment{
join = new MobileButton("icon-add", isize, "$joingame", ui.join::show), join = new MobileButton("icon-add", isize, "$joingame", ui.join::show),
editor = new MobileButton("icon-editor", isize, "$editor", () -> ui.loadAnd(ui.editor::show)), editor = new MobileButton("icon-editor", isize, "$editor", () -> ui.loadAnd(ui.editor::show)),
tools = new MobileButton("icon-tools", isize, "$settings", ui.settings::show), tools = new MobileButton("icon-tools", isize, "$settings", ui.settings::show),
unlocks = new MobileButton("icon-unlocks", isize, "$unlocks", ui.unlocks::show), unlocks = new MobileButton("icon-unlocks", isize, "database", ui.database::show),
donate = new MobileButton("icon-donate", isize, "$donate", Platform.instance::openDonations); donate = new MobileButton("icon-donate", isize, "$donate", Platform.instance::openDonations);
if(Core.graphics.getWidth() > Core.graphics.getHeight()){ if(Core.graphics.getWidth() > Core.graphics.getHeight()){