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

Fixed build errors

Browse Source
This commit is contained in:
Anuken
2018-01-05 11:39:41 -05:00
parent d9c15a8599
commit 7fdd50d85c
16 changed files with 51 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@@ -54,7 +54,7 @@ public class DesktopInput extends InputHandler{
endx = Gdx.input.getX();
endy = Gdx.input.getY();
if(Inputs.getAxisActive("zoom") && Inputs.keyDown("zoom_hold") && !GameState.is(State.menu) && !ui.onDialog()){
if(Inputs.getAxisActive("zoom") && Inputs.keyDown("zoom_hold") && !GameState.is(State.menu) && !ui.hasDialog()){
renderer.scaleCamera((int)Inputs.getAxis("zoom"));
}

2
core/src/io/anuke/mindustry/input/PlaceMode.java
View File

@@ -183,7 +183,7 @@ public enum PlaceMode{
endx = this.endx; endy = this.endy;
if(Vars.android){
ToolFragment t = Vars.ui.getTools();
ToolFragment t = Vars.ui.toolfrag;
if(!t.confirming || t.px != tilex || t.py != tiley || t.px2 != endx || t.py2 != endy) {
t.confirming = true;
t.px = tilex;