From ed6b49788d52a7636771d6c002a4fbc1522af798 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 16 Jul 2017 17:10:17 -0400 Subject: [PATCH] Fixed some Android bugs --- core/src/io/anuke/mindustry/Vars.java | 3 ++- core/src/io/anuke/mindustry/World.java | 4 +++- core/src/io/anuke/mindustry/input/AndroidInput.java | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index f5fbe57bc9..1d51afc1ab 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -21,7 +21,8 @@ public class Vars{ //not marked as final, because of warnings public static boolean debug = false; - public static final int multiplier = android ? 2 : 1; + //turret and enemy shoot speed inverse multiplier + public static final int multiplier = android ? 3 : 1; public static final int tilesize = 8; diff --git a/core/src/io/anuke/mindustry/World.java b/core/src/io/anuke/mindustry/World.java index 72546867dd..fb49061fc1 100644 --- a/core/src/io/anuke/mindustry/World.java +++ b/core/src/io/anuke/mindustry/World.java @@ -155,7 +155,9 @@ public class World{ return false; } } - return tile(x, y).block() == Blocks.air; + Tile tile = tile(x, y); + + return tile != null && tile.block() == Blocks.air; } public static boolean cursorNear(){ diff --git a/core/src/io/anuke/mindustry/input/AndroidInput.java b/core/src/io/anuke/mindustry/input/AndroidInput.java index 1540a1e7c5..6199cd9028 100644 --- a/core/src/io/anuke/mindustry/input/AndroidInput.java +++ b/core/src/io/anuke/mindustry/input/AndroidInput.java @@ -119,6 +119,9 @@ public class AndroidInput extends InputAdapter{ lmousex = Gdx.input.getX(0); lmousey = Gdx.input.getY(0); player.breaktime = 0; + + mousex = Mathf.clamp(mousex, 0, Gdx.graphics.getWidth()); + mousey = Mathf.clamp(mousey, 0, Gdx.graphics.getHeight()); } }