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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2018-10-15 16:20:44 -04:00
parent 5536ade389 21bc195213
commit 28b9975c75
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,9 +202,6 @@ public class DesktopInput extends InputHandler{
Tile selected = tileAt(Gdx.input.getX(), Gdx.input.getY()); Tile selected = tileAt(Gdx.input.getX(), Gdx.input.getY());
int cursorX = tileX(Gdx.input.getX()); int cursorX = tileX(Gdx.input.getX());
int cursorY = tileY(Gdx.input.getY()); int cursorY = tileY(Gdx.input.getY());
//if(cursor == null){
// return;
//}
if(Inputs.keyTap(section, "deselect")){ if(Inputs.keyTap(section, "deselect")){
player.setMineTile(null); player.setMineTile(null);

4
core/src/io/anuke/mindustry/input/InputHandler.java
View File

@@ -191,6 +191,10 @@ public abstract class InputHandler extends InputAdapter{
consumed = true; consumed = true;
frag.config.hideConfig(); frag.config.hideConfig();
} }
if(frag.config.isShown()){
consumed = true;
}
} }
//call tapped event //call tapped event

2
core/src/io/anuke/mindustry/maps/Sectors.java
View File

@@ -370,7 +370,7 @@ public class Sectors{
for(int x = 1; x <= width; x++){ for(int x = 1; x <= width; x++){
for(int y = 1; y <= height; y++){ for(int y = 1; y <= height; y++){
for(GridPoint2 point : Geometry.d8edge){ for(GridPoint2 point : Geometry.d8edge){
int shiftx = (int)(-width/2f + (point.x * (width - 1))/2f), shifty = (int)(-height/2f + (point.y * (height - 1))/2f); int shiftx = (int)(-x/2f + (point.x * (x - 1))/2f), shifty = (int)(-y/2f + (point.y * (y - 1))/2f);
if(canFit(sector.x + shiftx, sector.y + shifty, x, y)){ if(canFit(sector.x + shiftx, sector.y + shifty, x, y)){
finalWidth = x; finalWidth = x;
finalHeight = y; finalHeight = y;