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

Misc turret progress

Browse Source
This commit is contained in:
Anuken
2022-02-11 15:24:34 -05:00
parent ba3e2f6f67
commit 7c507ce2f4
7 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/mindustry/input/DesktopInput.java
View File

@@ -9,7 +9,6 @@ import arc.input.*;
import arc.math.*;
import arc.math.geom.*;
import arc.scene.*;
import arc.scene.ui.*;
import arc.scene.ui.layout.*;
import arc.util.*;
import mindustry.*;
@@ -277,10 +276,8 @@ public class DesktopInput extends InputHandler{
shouldShoot = !scene.hasMouse() && !locked;
if(!locked && state.rules.unitCommand && block == null){
//if(input.keyTap(Binding.commandMode)){
commandMode = input.keyDown(Binding.commandMode);
//}
if(!locked && state.rules.unitCommand && block == null && !scene.hasField()){
commandMode = input.keyDown(Binding.commandMode);
}else{
commandMode = false;
}
@@ -317,7 +314,7 @@ public class DesktopInput extends InputHandler{
player.shooting = false;
}
if(state.isGame() && !scene.hasDialog() && !(scene.getKeyboardFocus() instanceof TextField)){
if(state.isGame() && !scene.hasDialog() && !scene.hasField()){
if(Core.input.keyTap(Binding.minimap)) ui.minimapfrag.toggle();
if(Core.input.keyTap(Binding.planet_map) && state.isCampaign()) ui.planet.toggle();
if(Core.input.keyTap(Binding.research) && state.isCampaign()) ui.research.toggle();
@@ -450,7 +447,7 @@ public class DesktopInput extends InputHandler{
}
void pollInput(){
if(scene.getKeyboardFocus() instanceof TextField) return;
if(scene.hasField()) return;
Tile selected = tileAt(Core.input.mouseX(), Core.input.mouseY());
int cursorX = tileX(Core.input.mouseX());