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

Removed UnitComp#uiIcon()

Browse Source
This commit is contained in:
Anuken
2024-04-22 17:31:13 -04:00
parent 49489ffadc
commit 31f4957657
4 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/entities/comp/BlockUnitComp.java
View File

@@ -40,12 +40,6 @@ abstract class BlockUnitComp implements Unitc{
@Replace @Replace
@Override @Override
public TextureRegion icon(){ public TextureRegion icon(){
return tile.block.fullIcon;
}
@Replace
@Override
public TextureRegion uiIcon(){
return tile.block.uiIcon; return tile.block.uiIcon;
} }

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

@@ -74,7 +74,7 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
//display default icon for dead players //display default icon for dead players
if(dead()) return core() == null ? UnitTypes.alpha.uiIcon : ((CoreBlock)bestCore().block).unitType.uiIcon; if(dead()) return core() == null ? UnitTypes.alpha.uiIcon : ((CoreBlock)bestCore().block).unitType.uiIcon;
return unit.uiIcon(); return unit.icon();
} }
public boolean displayAmmo(){ public boolean displayAmmo(){

7
core/src/mindustry/entities/comp/UnitComp.java
View File

@@ -666,13 +666,8 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
} }
} }
/** @return a preview icon for this unit. */
public TextureRegion icon(){
return type.fullIcon;
}
/** @return a preview UI icon for this unit. */ /** @return a preview UI icon for this unit. */
public TextureRegion uiIcon(){ public TextureRegion icon(){
return type.uiIcon; return type.uiIcon;
} }

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

@@ -166,7 +166,7 @@ public class MinimapRenderer{
if(unit.inFogTo(player.team()) || !unit.type.drawMinimap) continue; if(unit.inFogTo(player.team()) || !unit.type.drawMinimap) continue;
float scale = Scl.scl(1f) * tilesize * 3; float scale = Scl.scl(1f) * tilesize * 3;
var region = unit.uiIcon(); var region = unit.icon();
Draw.mixcol(unit.team.color, 1f); Draw.mixcol(unit.team.color, 1f);
Draw.rect(region, unit.x, unit.y, scale, scale * (float)region.height / region.width, unit.rotation() - 90); Draw.rect(region, unit.x, unit.y, scale, scale * (float)region.height / region.width, unit.rotation() - 90);