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

Fixed portrait custom game dialog

Browse Source
This commit is contained in:
Anuken
2019-04-29 11:27:15 -04:00
parent 1f11da75d2
commit fb724514f3
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/editor/EditorTile.java
View File

@@ -36,7 +36,7 @@ public class EditorTile extends Tile{
Block ore = overlay(); Block ore = overlay();
if(previous == type && ore == Blocks.air) return; if(previous == type && ore == Blocks.air) return;
super.setFloor(type); super.setFloor(type);
//ore may get nullified so make sure to save editrs //ore may get nullified so make sure to save edits
if(overlay() != ore){ if(overlay() != ore){
op(TileOp.get(x, y, (byte)OpType.ore.ordinal(), ore.id, overlay().id)); op(TileOp.get(x, y, (byte)OpType.ore.ordinal(), ore.id, overlay().id));
} }

9
core/src/io/anuke/mindustry/entities/traits/Entity.java
View File

@@ -8,14 +8,11 @@ public interface Entity extends MoveTrait{
void resetID(int id); void resetID(int id);
default void update(){ default void update(){}
}
default void removed(){ default void removed(){}
}
default void added(){ default void added(){}
}
EntityGroup targetGroup(); EntityGroup targetGroup();

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

@@ -9,6 +9,7 @@ import io.anuke.arc.scene.ui.ImageButton;
import io.anuke.arc.scene.ui.ScrollPane; import io.anuke.arc.scene.ui.ScrollPane;
import io.anuke.arc.scene.ui.TextButton; import io.anuke.arc.scene.ui.TextButton;
import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.scene.utils.UIUtils;
import io.anuke.arc.util.Align; import io.anuke.arc.util.Align;
import io.anuke.arc.util.Scaling; import io.anuke.arc.util.Scaling;
import io.anuke.mindustry.game.Difficulty; import io.anuke.mindustry.game.Difficulty;
@@ -43,7 +44,7 @@ public class CustomGameDialog extends FloatingDialog{
ScrollPane pane = new ScrollPane(maps); ScrollPane pane = new ScrollPane(maps);
pane.setFadeScrollBars(false); pane.setFadeScrollBars(false);
int maxwidth = (Core.graphics.getHeight() > Core.graphics.getHeight() ? 2 : 4); int maxwidth = (UIUtils.portrait() ? 2 : 4);
Table selmode = new Table(); Table selmode = new Table();
ButtonGroup<TextButton> group = new ButtonGroup<>(); ButtonGroup<TextButton> group = new ButtonGroup<>();

2
server/src/io/anuke/mindustry/server/ServerControl.java
View File

@@ -100,7 +100,7 @@ public class ServerControl implements ApplicationListener{
if(args.length > 0){ if(args.length > 0){
commands = Strings.join(" ", args).split(","); commands = Strings.join(" ", args).split(",");
info("&lmFound {0} command-line arguments to parse. {1}", commands.length); info("&lmFound {0} command-line arguments to parse.", commands.length);
} }
for(String s : commands){ for(String s : commands){