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

Fixed numerical rules resetting on Android

Browse Source
This commit is contained in:
Anuken
2019-07-29 17:19:17 -04:00
parent 132d058098
commit 43280ee077
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@ package io.anuke.mindustry.ui.dialogs;
import io.anuke.arc.function.*; import io.anuke.arc.function.*;
import io.anuke.arc.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.arc.scene.ui.layout.Table; 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.Blocks;
import io.anuke.mindustry.content.Items; import io.anuke.mindustry.content.Items;
import io.anuke.mindustry.core.Platform; import io.anuke.mindustry.core.Platform;

3
core/src/io/anuke/mindustry/ui/dialogs/MapPlayDialog.java
View File

@@ -22,7 +22,9 @@ public class MapPlayDialog extends FloatingDialog{
onResize(() -> { onResize(() -> {
if(lastMap != null){ if(lastMap != null){
Rules rules = this.rules;
show(lastMap); show(lastMap);
this.rules = rules;
} }
}); });
} }
@@ -53,6 +55,7 @@ public class MapPlayDialog extends FloatingDialog{
modes.addButton(mode.toString(), "toggle", () -> { modes.addButton(mode.toString(), "toggle", () -> {
selectedGamemode = mode; selectedGamemode = mode;
rules = mode.apply(map.rules()); rules = mode.apply(map.rules());
Log.info("toggle rules " + rules);
}).update(b -> b.setChecked(selectedGamemode == mode)).size(140f, 54f).disabled(!mode.valid(map)); }).update(b -> b.setChecked(selectedGamemode == mode)).size(140f, 54f).disabled(!mode.valid(map));
if(i++ % 2 == 1) modes.row(); if(i++ % 2 == 1) modes.row();
} }