From 3b58d57e5c34f5b095ff27a2766f267fdb1a6385 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 18 Oct 2018 16:58:57 -0400 Subject: [PATCH] Fixed unlocks not clearing / Fixed map editor not updating --- core/src/io/anuke/mindustry/editor/MapEditorDialog.java | 3 ++- core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index 6beed7a5f1..22a885c7fe 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -222,7 +222,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ clearChildren(); margin(0); - build(); + shown(this::build); update(() -> { 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)) : Math.min(Gdx.graphics.getDisplayMode().height / amount, baseSize); + clearChildren(); table(cont -> { cont.left(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index ab131b512e..bccb2816ad 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -160,7 +160,7 @@ public class SettingsMenuDialog extends SettingsDialog{ dialog.content().row(); dialog.content().addButton("$text.settings.clearunlocks", "clear", () -> { ui.showConfirm("$text.confirm", "$text.settings.clear.confirm", () -> { - Settings.clearBytes("unlocks"); + control.unlocks.reset(); Settings.save(); dialog.hide(); });