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

Fixes for new placement system

Browse Source
This commit is contained in:
Anuken
2017-12-15 20:54:32 -05:00
parent 9c0d9f4e13
commit 8fb001a693
6 changed files with 224 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ public class AndroidInput extends InputHandler{
@Override
public boolean touchUp(int screenX, int screenY, int pointer, int button){
//if(ui.hasMouse()) return false;
if(brokeBlock) return false;
brokeBlock = false;
if(placing && pointer == 0 && !player.placeMode.pan){

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

@@ -28,7 +28,7 @@ public class GestureHandler extends GestureAdapter{
@Override
public boolean tap (float x, float y, int count, int button) {
if(ui.hasMouse()) return false;
if(ui.hasMouse() || input.brokeBlock) return false;
if(!player.placeMode.pan || player.recipe == null){
input.mousex = x;
@@ -58,7 +58,7 @@ public class GestureHandler extends GestureAdapter{
@Override
public boolean pinch (Vector2 initialPointer1, Vector2 initialPointer2, Vector2 pointer1, Vector2 pointer2) {
if(player.recipe == null)
if(player.recipe == null && !player.breakMode.lockCamera)
return false;
if(pinch1.x < 0){