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

Fixed: map mirror / crashes / mech pads / player list / mobile placement

Browse Source
This commit is contained in:
Anuken
2018-10-17 10:20:58 -04:00
parent a29f95194d
commit 8e952a550b
17 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,6 +107,7 @@ public class DesktopInput extends InputHandler{
}
}
Draw.color(Palette.remove);
Lines.rect(result.x, result.y, result.x2 - result.x, result.y2 - result.y);
}else if(isPlacing()){
if(recipe.result.rotate){

17
core/src/io/anuke/mindustry/input/MobileInput.java
View File

@@ -178,11 +178,13 @@ public class MobileInput extends InputHandler implements GestureListener{
request.recipe.result.rotate ? request.rotation * 90 : 0);
}
}else{
float rad = (tile.block().size * tilesize / 2f - 1) * request.scale;
Draw.alpha(0f);
//draw removing request
Draw.color(Palette.removeBack);
Lines.square(tile.drawx(), tile.drawy()-1, tile.block().size * tilesize / 2f);
Draw.color(Palette.remove);
Lines.square(tile.drawx(), tile.drawy(), tile.block().size * tilesize / 2f);
Draw.tint(Palette.removeBack);
Lines.square(tile.drawx(), tile.drawy()-1, rad);
Draw.tint(Palette.remove);
Lines.square(tile.drawx(), tile.drawy(), rad);
}
}
@@ -242,7 +244,7 @@ public class MobileInput extends InputHandler implements GestureListener{
}
}
//move all current requests to removal array to they fade out
//move all current requests to removal array so they fade out
removals.addAll(selection);
selection.clear();
selecting = false;
@@ -383,12 +385,13 @@ public class MobileInput extends InputHandler implements GestureListener{
other = other.target();
Draw.color(Palette.removeBack);
Lines.square(other.drawx(), other.drawy()-1, other.block().size * tilesize / 2f);
Lines.square(other.drawx(), other.drawy()-1, other.block().size * tilesize / 2f - 1);
Draw.color(Palette.remove);
Lines.square(other.drawx(), other.drawy(), other.block().size * tilesize / 2f);
Lines.square(other.drawx(), other.drawy(), other.block().size * tilesize / 2f - 1);
}
}
Draw.color(Palette.remove);
Lines.rect(result.x, result.y, result.x2 - result.x, result.y2 - result.y);
}