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

Fixed unlocks not clearing / Fixed map editor not updating

Browse Source
This commit is contained in:
Anuken
2018-10-18 16:58:57 -04:00
parent cecf32e52e
commit 3b58d57e5c
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/editor/MapEditorDialog.java
View File

@@ -222,7 +222,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
clearChildren(); clearChildren();
margin(0); margin(0);
build(); shown(this::build);
update(() -> { update(() -> {
if(Core.scene.getKeyboardFocus() instanceof Dialog && Core.scene.getKeyboardFocus() != this){ if(Core.scene.getKeyboardFocus() instanceof Dialog && Core.scene.getKeyboardFocus() != this){
@@ -382,6 +382,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
float size = mobile ? (int) (Math.min(Gdx.graphics.getHeight(), Gdx.graphics.getWidth()) / amount / Unit.dp.scl(1f)) : float size = mobile ? (int) (Math.min(Gdx.graphics.getHeight(), Gdx.graphics.getWidth()) / amount / Unit.dp.scl(1f)) :
Math.min(Gdx.graphics.getDisplayMode().height / amount, baseSize); Math.min(Gdx.graphics.getDisplayMode().height / amount, baseSize);
clearChildren();
table(cont -> { table(cont -> {
cont.left(); cont.left();

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

@@ -160,7 +160,7 @@ public class SettingsMenuDialog extends SettingsDialog{
dialog.content().row(); dialog.content().row();
dialog.content().addButton("$text.settings.clearunlocks", "clear", () -> { dialog.content().addButton("$text.settings.clearunlocks", "clear", () -> {
ui.showConfirm("$text.confirm", "$text.settings.clear.confirm", () -> { ui.showConfirm("$text.confirm", "$text.settings.clear.confirm", () -> {
Settings.clearBytes("unlocks"); control.unlocks.reset();
Settings.save(); Settings.save();
dialog.hide(); dialog.hide();
}); });