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

Fixed build errors

Browse Source
This commit is contained in:
Anuken
2018-01-05 11:39:41 -05:00
parent d9c15a8599
commit 7fdd50d85c
16 changed files with 51 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/ui/dialogs/MenuDialog.java
View File

@@ -41,7 +41,7 @@ public class MenuDialog extends FloatingDialog{
});
content().row();
content().addButton("$text.settings", ui.prefs::show);
content().addButton("$text.settings", ui.settings::show);
content().row();
content().addButton("$text.savegame", () -> {
@@ -87,7 +87,7 @@ public class MenuDialog extends FloatingDialog{
GameState.set(State.playing);
}).text("$text.back").padTop(4f);
new imagebutton("icon-tools", isize, ui.prefs::show).text("$text.settings").padTop(4f);
new imagebutton("icon-tools", isize, ui.settings::show).text("$text.settings").padTop(4f);
new imagebutton("icon-save", isize, save::show).text("$text.save").padTop(4f);

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

@@ -86,7 +86,7 @@ public class SettingsMenuDialog extends SettingsDialog{
if(!Vars.android) {
menu.row();
menu.addButton("$text.settings.controls", Vars.ui.keys::show);
menu.addButton("$text.settings.controls", Vars.ui.controls::show);
}
prefs.clearChildren();

4
core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java
View File

@@ -1,6 +1,8 @@
package io.anuke.mindustry.ui.fragments;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Draw;
import io.anuke.ucore.scene.ui.layout.Unit;
@@ -27,6 +29,6 @@ public class BackgroundFragment implements Fragment {
Draw.color();
Core.batch.draw(logo, w/2 - logow/2, h - logoh + 15, logow, logoh);
});
}).visible(() -> GameState.is(State.menu)).grow();
}
}

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

@@ -44,7 +44,7 @@ public class MenuFragment implements Fragment{
row();
}
add(new MenuButton("$text.settings", group, ui.prefs::show));
add(new MenuButton("$text.settings", group, ui.settings::show));
row();
if(!gwt){
@@ -73,7 +73,7 @@ public class MenuFragment implements Fragment{
new imagebutton("icon-editor", isize, ui.editor::show).text("$text.editor").padTop(4f);
new imagebutton("icon-tools", isize, ui.prefs::show).text("$text.settings").padTop(4f);
new imagebutton("icon-tools", isize, ui.settings::show).text("$text.settings").padTop(4f);
new imagebutton("icon-info", isize, ui.about::show).text("$text.about.button").padTop(4f);