diff --git a/core/src/mindustry/editor/MapGenerateDialog.java b/core/src/mindustry/editor/MapGenerateDialog.java index 34275afcd1..55576742c4 100644 --- a/core/src/mindustry/editor/MapGenerateDialog.java +++ b/core/src/mindustry/editor/MapGenerateDialog.java @@ -54,6 +54,11 @@ public class MapGenerateDialog extends BaseDialog{ protected void changeBuild(Team team, Prov entityprov, int rotation){ } + + @Override + public void setBlock(Block type, Team team, int rotation, Prov entityprov){ + this.block = type; + } }; /** @param applied whether or not to use the applied in-game mode. */ diff --git a/core/src/mindustry/entities/comp/MinerComp.java b/core/src/mindustry/entities/comp/MinerComp.java index 9476d855f5..021a5885e3 100644 --- a/core/src/mindustry/entities/comp/MinerComp.java +++ b/core/src/mindustry/entities/comp/MinerComp.java @@ -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 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)); diff --git a/core/src/mindustry/graphics/OverlayRenderer.java b/core/src/mindustry/graphics/OverlayRenderer.java index 9bb3a95fa3..c28859d5f3 100644 --- a/core/src/mindustry/graphics/OverlayRenderer.java +++ b/core/src/mindustry/graphics/OverlayRenderer.java @@ -36,7 +36,7 @@ public class OverlayRenderer{ public void drawTop(){ - if(!player.dead()){ + if(!player.dead() && ui.hudfrag.shown){ if(Core.settings.getBool("playerindicators")){ for(Player player : Groups.player){ if(Vars.player != player && Vars.player.team() == player.team()){ diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index 67a7de2c87..8af32b3832 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -92,7 +92,7 @@ public class HudFragment extends Fragment{ //paused table parent.fill(t -> { 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(); });