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

spaghetti eradicated

Browse Source
This commit is contained in:
Anuken
2019-09-22 01:37:50 -04:00
parent b2bae64215
commit e5cf2161d4
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/core/Renderer.java
View File

@@ -295,7 +295,7 @@ public class Renderer implements ApplicationListener{
overlays.drawTop();
playerGroup.draw(p -> !p.isDead() && !p.isLocal, Player::drawName);
playerGroup.draw(p -> !p.isDead(), Player::drawName);
drawLanding();

12
core/src/io/anuke/mindustry/entities/type/Player.java
View File

@@ -383,12 +383,14 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
font.setUseIntegerPositions(false);
font.getData().setScale(0.25f / Scl.scl(1f));
layout.setText(font, name);
Draw.color(0f, 0f, 0f, 0.3f);
Fill.rect(x, y + nameHeight - layout.height / 2, layout.width + 2, layout.height + 3);
Draw.color();
font.setColor(color);
font.draw(name, x, y + nameHeight, 0, Align.center, false);
if(!isLocal){
Draw.color(0f, 0f, 0f, 0.3f);
Fill.rect(x, y + nameHeight - layout.height / 2, layout.width + 2, layout.height + 3);
Draw.color();
font.setColor(color);
font.draw(name, x, y + nameHeight, 0, Align.center, false);
}
if(isAdmin){
float s = 3f;

2
core/src/io/anuke/mindustry/graphics/Pixelator.java
View File

@@ -55,7 +55,7 @@ public class Pixelator implements Disposable{
Draw.rect(Draw.wrap(buffer.getTexture()), Core.camera.position.x, Core.camera.position.y, Core.camera.width, -Core.camera.height);
Draw.blend();
playerGroup.draw(p -> !p.isDead() && !p.isLocal, Player::drawName);
playerGroup.draw(p -> !p.isDead(), Player::drawName);
Core.camera.position.set(px, py);
Core.settings.put("animatedwater", hadWater);