mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-27 23:11:12 -08:00
Code Issues Projects Releases Wiki Activity

More movement

Browse source
This commit is contained in:
Anuken 2020-02-07 18:55:53 -05:00
parent 4265d40024
commit 8a9c92227d
4 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/src/mindustry/input/DesktopInput.java
View file

@ -163,9 +163,8 @@ public class DesktopInput extends InputHandler{
}
}
//TODO implement
if(!player.dead()){
updateKeyboard(player.unit());
if(!player.dead() && !state.isPaused()){
updateMovement(player.unit());
}
if(Core.input.keyRelease(Binding.select)){
@ -179,7 +178,8 @@ public class DesktopInput extends InputHandler{
if(state.is(State.menu) || Core.scene.hasDialog()) return;
//zoom camera
if((!Core.scene.hasScroll() || Core.input.keyDown(Binding.diagonal_placement)) && !ui.chatfrag.shown() && Math.abs(Core.input.axisTap(Binding.zoom)) > 0 && !Core.input.keyDown(Binding.rotateplaced) && (Core.input.keyDown(Binding.diagonal_placement) || ((!isPlacing() || !block.rotate) && selectRequests.isEmpty()))){
if((!Core.scene.hasScroll() || Core.input.keyDown(Binding.diagonal_placement)) && !ui.chatfrag.shown() && Math.abs(Core.input.axisTap(Binding.zoom)) > 0
&& !Core.input.keyDown(Binding.rotateplaced) && (Core.input.keyDown(Binding.diagonal_placement) || ((!isPlacing() || !block.rotate) && selectRequests.isEmpty()))){
renderer.scaleCamera(Core.input.axisTap(Binding.zoom));
}
@ -494,7 +494,7 @@ public class DesktopInput extends InputHandler{
}
}
protected void updateKeyboard(Unitc unit){
protected void updateMovement(Unitc unit){
boolean canMove = !(Core.scene.getKeyboardFocus() instanceof TextField);
float speed = unit.type().speed;