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

Disabled NYI gamemode selection, removed test map

Browse Source
This commit is contained in:
Anuken
2018-06-24 21:33:37 -04:00
parent d8e8765cec
commit 50372ed9f3
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/io/Maps.java
View File

@@ -18,7 +18,7 @@ import static io.anuke.mindustry.Vars.*;
public class Maps implements Disposable{ public class Maps implements Disposable{
/**List of all built-in maps.*/ /**List of all built-in maps.*/
private static final String[] defaultMapNames = {"test"}; private static final String[] defaultMapNames = {};
/**Tile format version.*/ /**Tile format version.*/
private static final int version = 0; private static final int version = 0;

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

@@ -18,6 +18,7 @@ import io.anuke.ucore.scene.event.Touchable;
import io.anuke.ucore.scene.ui.*; import io.anuke.ucore.scene.ui.*;
import io.anuke.ucore.scene.ui.layout.Stack; import io.anuke.ucore.scene.ui.layout.Stack;
import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.scene.utils.Cursors;
import io.anuke.ucore.scene.utils.Elements; import io.anuke.ucore.scene.utils.Elements;
import io.anuke.ucore.util.Bundles; import io.anuke.ucore.util.Bundles;
import io.anuke.ucore.util.Log; import io.anuke.ucore.util.Log;
@@ -50,6 +51,7 @@ public class LevelDialog extends FloatingDialog{
TextButton[] b = {null}; TextButton[] b = {null};
b[0] = Elements.newButton("$mode." + mode.name() + ".name", "toggle", () -> state.mode = mode); b[0] = Elements.newButton("$mode." + mode.name() + ".name", "toggle", () -> state.mode = mode);
b[0].update(() -> b[0].setChecked(state.mode == mode)); b[0].update(() -> b[0].setChecked(state.mode == mode));
b[0].setDisabled(true);
group.add(b[0]); group.add(b[0]);
selmode.add(b[0]).size(130f, 54f); selmode.add(b[0]).size(130f, 54f);
} }
@@ -129,6 +131,7 @@ public class LevelDialog extends FloatingDialog{
ui.loadfrag.show(); ui.loadfrag.show();
Timers.run(5f, () -> { Timers.run(5f, () -> {
Cursors.restoreCursor();
threads.run(() -> { threads.run(() -> {
Timers.mark(); Timers.mark();
MapTileData data = WorldGenerator.generate(); MapTileData data = WorldGenerator.generate();