Cleanup / Fixed unlock system in custom games

This commit is contained in:
Anuken
2018-09-29 02:50:21 -07:00
parent 4810bbbbd9
commit d062dffc13
18 changed files with 42 additions and 62 deletions

View File

@@ -69,7 +69,7 @@ public class DesktopInput extends InputHandler{
@Override
public void drawOutlined(){
Tile cursor = tileAt(control.gdxInput().getX(), control.gdxInput().getY());
Tile cursor = tileAt(Gdx.input.getX(), Gdx.input.getY());
if(cursor == null) return;
@@ -170,7 +170,7 @@ public class DesktopInput extends InputHandler{
rotation = Mathf.mod(rotation + (int) Inputs.getAxisTapped(section, "rotate"), 4);
Tile cursor = tileAt(control.gdxInput().getX(), control.gdxInput().getY());
Tile cursor = tileAt(Gdx.input.getX(), Gdx.input.getY());
if(player.isDead()){
cursorType = normal;
@@ -200,7 +200,7 @@ public class DesktopInput extends InputHandler{
}
void pollInput(){
Tile cursor = tileAt(control.gdxInput().getX(), control.gdxInput().getY());
Tile cursor = tileAt(Gdx.input.getX(), Gdx.input.getY());
if(cursor == null){
mode = none;
return;
@@ -271,12 +271,12 @@ public class DesktopInput extends InputHandler{
@Override
public float getMouseX(){
return !controlling ? control.gdxInput().getX() : controlx;
return !controlling ? Gdx.input.getX() : controlx;
}
@Override
public float getMouseY(){
return !controlling ? control.gdxInput().getY() : controly;
return !controlling ? Gdx.input.getY() : controly;
}
@Override
@@ -329,8 +329,8 @@ public class DesktopInput extends InputHandler{
}
if(!controlling){
controlx = control.gdxInput().getX();
controly = control.gdxInput().getY();
controlx = Gdx.input.getX();
controly = Gdx.input.getY();
}
}

View File

@@ -1,5 +1,6 @@
package io.anuke.mindustry.input;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.InputAdapter;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.Vector2;
@@ -130,11 +131,11 @@ public abstract class InputHandler extends InputAdapter{
}
public float getMouseX(){
return control.gdxInput().getX();
return Gdx.input.getX();
}
public float getMouseY(){
return control.gdxInput().getY();
return Gdx.input.getY();
}
public void resetCursor(){

View File

@@ -338,7 +338,7 @@ public class MobileInput extends InputHandler implements GestureListener{
//Draw lines
if(lineMode){
Tile tile = tileAt(control.gdxInput().getX(), control.gdxInput().getY());
Tile tile = tileAt(Gdx.input.getX(), Gdx.input.getY());
if(tile != null){