From 43280ee0774d8af59cecde5266ef259a2c097975 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 29 Jul 2019 17:19:17 -0400 Subject: [PATCH] Fixed numerical rules resetting on Android --- core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java | 2 +- core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java index ea0cb7940d..f391912fb0 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/CustomRulesDialog.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.ui.dialogs; import io.anuke.arc.function.*; import io.anuke.arc.graphics.Color; import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.arc.util.Strings; +import io.anuke.arc.util.*; import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.Items; import io.anuke.mindustry.core.Platform; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java index 1bc7051710..80ccca0d46 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java @@ -22,7 +22,9 @@ public class MapPlayDialog extends FloatingDialog{ onResize(() -> { if(lastMap != null){ + Rules rules = this.rules; show(lastMap); + this.rules = rules; } }); } @@ -53,6 +55,7 @@ public class MapPlayDialog extends FloatingDialog{ modes.addButton(mode.toString(), "toggle", () -> { selectedGamemode = mode; rules = mode.apply(map.rules()); + Log.info("toggle rules " + rules); }).update(b -> b.setChecked(selectedGamemode == mode)).size(140f, 54f).disabled(!mode.valid(map)); if(i++ % 2 == 1) modes.row(); }