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

Cleanup

Browse Source
This commit is contained in:
Anuken
2022-03-11 00:11:13 -05:00
parent 96329b9b2e
commit da1517879a
29 changed files with 96 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -323,8 +323,8 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
/** Deselect this tile from configuration. */
public void deselect(){
if(!headless && control.input.frag.config.getSelectedTile() == self()){
control.input.frag.config.hideConfig();
if(!headless && control.input.config.getSelected() == self()){
control.input.config.hideConfig();
}
}
@@ -1470,7 +1470,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
* Called when another tile is tapped while this block is selected.
* @return whether this block should be deselected.
*/
public boolean onConfigureTileTapped(Building other){
public boolean onConfigureBuildTapped(Building other){
if(block.clearOnDoubleTap){
if(self() == other){
deselect();
@@ -1482,6 +1482,15 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
return self() != other;
}
/**
* Called when a position is tapped when this building is selected.
*
* @return whether the tap event is consumed - if true, the player will not start shooting or interact with things under the cursor.
* */
public boolean onConfigureTapped(float x, float y){
return false;
}
/**
* Called when this block's config menu is closed
*/