mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-13 19:39:04 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #3140

Browse Source
This commit is contained in:
Anuken 2020-10-26 16:54:47 -04:00
parent 909da9de3c
commit 8d7f96bf00
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/editor/MapGenerateDialog.java
View File

@ -54,6 +54,11 @@ public class MapGenerateDialog extends BaseDialog{
protected void changeBuild(Team team, Prov<Building> entityprov, int rotation){ protected void changeBuild(Team team, Prov<Building> entityprov, int rotation){
} }
@Override
public void setBlock(Block type, Team team, int rotation, Prov<Building> entityprov){
this.block = type;
}
}; };
/** @param applied whether or not to use the applied in-game mode. */ /** @param applied whether or not to use the applied in-game mode. */

2
core/src/mindustry/entities/comp/MinerComp.java
View File

@ -105,7 +105,7 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc, Unitc{
float ex = mineTile.worldx() + Mathf.sin(Time.time() + 48, swingScl, swingMag); float ex = mineTile.worldx() + Mathf.sin(Time.time() + 48, swingScl, swingMag);
float ey = mineTile.worldy() + Mathf.sin(Time.time() + 48, swingScl + 2f, swingMag); float ey = mineTile.worldy() + Mathf.sin(Time.time() + 48, swingScl + 2f, swingMag);
Draw.z(Layer.flyingUnitLow - 0.1f); Draw.z(multimine ? Layer.flyingUnit + 0.1f : Layer.flyingUnitLow - 0.1f);
Draw.color(Color.lightGray, Color.white, 1f - flashScl + Mathf.absin(Time.time(), 0.5f, flashScl)); Draw.color(Color.lightGray, Color.white, 1f - flashScl + Mathf.absin(Time.time(), 0.5f, flashScl));

2
core/src/mindustry/graphics/OverlayRenderer.java
View File

@ -36,7 +36,7 @@ public class OverlayRenderer{
public void drawTop(){ public void drawTop(){
if(!player.dead()){ if(!player.dead() && ui.hudfrag.shown){
if(Core.settings.getBool("playerindicators")){ if(Core.settings.getBool("playerindicators")){
for(Player player : Groups.player){ for(Player player : Groups.player){
if(Vars.player != player && Vars.player.team() == player.team()){ if(Vars.player != player && Vars.player.team() == player.team()){

2
core/src/mindustry/ui/fragments/HudFragment.java
View File

@ -92,7 +92,7 @@ public class HudFragment extends Fragment{
//paused table //paused table
parent.fill(t -> { parent.fill(t -> {
t.name = "paused"; t.name = "paused";
t.top().visible(() -> state.isPaused()).touchable = Touchable.disabled; t.top().visible(() -> state.isPaused() && shown).touchable = Touchable.disabled;
t.table(Styles.black5, top -> top.add("@paused").style(Styles.outlineLabel).pad(8f)).growX(); t.table(Styles.black5, top -> top.add("@paused").style(Styles.outlineLabel).pad(8f)).growX();
}); });