From 1c8fd4cc38c976e9b95488ca97476f2d9d37e54c Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 24 Jul 2020 13:50:57 -0400 Subject: [PATCH] https://github.com/Anuken/Mindustry-Suggestions/issues/336 --- .../mindustry/graphics/OverlayRenderer.java | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/core/src/mindustry/graphics/OverlayRenderer.java b/core/src/mindustry/graphics/OverlayRenderer.java index 8b7f940197..8153cf185a 100644 --- a/core/src/mindustry/graphics/OverlayRenderer.java +++ b/core/src/mindustry/graphics/OverlayRenderer.java @@ -35,32 +35,35 @@ public class OverlayRenderer{ public void drawTop(){ - if(Core.settings.getBool("playerindicators")){ - for(Player player : Groups.player){ - if(Vars.player != player && Vars.player.team() == player.team()){ - if(!rect.setSize(Core.camera.width * 0.9f, Core.camera.height * 0.9f) - .setCenter(Core.camera.position.x, Core.camera.position.y).contains(player.x, player.y)){ + if(!player.dead()){ + if(Core.settings.getBool("playerindicators")){ + for(Player player : Groups.player){ + if(Vars.player != player && Vars.player.team() == player.team()){ + if(!rect.setSize(Core.camera.width * 0.9f, Core.camera.height * 0.9f) + .setCenter(Core.camera.position.x, Core.camera.position.y).contains(player.x, player.y)){ - Tmp.v1.set(player.x, player.y).sub(Core.camera.position.x, Core.camera.position.y).setLength(indicatorLength); + Tmp.v1.set(player.x, player.y).sub(player).setLength(indicatorLength); - Lines.stroke(2f, player.team().color); - Lines.lineAngle(Core.camera.position.x + Tmp.v1.x, Core.camera.position.y + Tmp.v1.y, Tmp.v1.angle(), 4f); - Draw.reset(); + Lines.stroke(2f, player.team().color); + Lines.lineAngle(player.x + Tmp.v1.x, player.y + Tmp.v1.y, Tmp.v1.angle(), 4f); + Draw.reset(); + } } } } - } - if(Core.settings.getBool("indicators")){ - Groups.unit.each(unit -> { - if(!unit.isLocal() && unit.team() != player.team() && !rect.setSize(Core.camera.width * 0.9f, Core.camera.height * 0.9f).setCenter(Core.camera.position.x, Core.camera.position.y).contains(unit.x(), unit.y())){ - Tmp.v1.set(unit.x(), unit.y()).sub(Core.camera.position.x, Core.camera.position.y).setLength(indicatorLength); + if(Core.settings.getBool("indicators")){ + Groups.unit.each(unit -> { + if(!unit.isLocal() && unit.team != player.team() && !rect.setSize(Core.camera.width * 0.9f, Core.camera.height * 0.9f) + .setCenter(Core.camera.position.x, Core.camera.position.y).contains(unit.x, unit.y)){ + Tmp.v1.set(unit.x, unit.y).sub(player).setLength(indicatorLength); - Lines.stroke(1f, unit.team().color); - Lines.lineAngle(Core.camera.position.x + Tmp.v1.x, Core.camera.position.y + Tmp.v1.y, Tmp.v1.angle(), 3f); - Draw.reset(); - } - }); + Lines.stroke(1f, unit.team().color); + Lines.lineAngle(player.x + Tmp.v1.x, player.y + Tmp.v1.y, Tmp.v1.angle(), 3f); + Draw.reset(); + } + }); + } } if(player.dead()) return; //dead players don't draw