diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 04ca534adc..fbd7e599d7 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -431,6 +431,8 @@ public class UnitType extends UnlockableContent implements Senseable{ public TextureRegion[] wreckRegions, segmentRegions, segmentOutlineRegions; public TextureRegion[][] treadRegions; + //INTERNAL REQUIREMENTS + protected float buildTime = -1f; protected @Nullable ItemStack[] totalRequirements, cachedRequirements, firstRequirements; @@ -1183,6 +1185,8 @@ public class UnitType extends UnlockableContent implements Senseable{ //region drawing + + /** Set up drawing state before calling! e.g. drawingPayload */ public void draw(Unit unit){ if(unit.inFogTo(Vars.player.team())) return; diff --git a/core/src/mindustry/world/blocks/payloads/UnitPayload.java b/core/src/mindustry/world/blocks/payloads/UnitPayload.java index 48fd9cac8c..fb22ceb94c 100644 --- a/core/src/mindustry/world/blocks/payloads/UnitPayload.java +++ b/core/src/mindustry/world/blocks/payloads/UnitPayload.java @@ -146,19 +146,10 @@ public class UnitPayload implements Payload{ //TODO should not happen if(unit.type == null) return; - //TODO this would be more accurate but has all sorts of associated problems (?) - if(false){ - float e = unit.elevation; - unit.elevation = 0f; - //avoids drawing mining or building - unit.type.draw(unit); - unit.elevation = e; - return; - } - - unit.type.drawSoftShadow(unit); - Draw.rect(unit.type.fullIcon, unit.x, unit.y, unit.rotation - 90); - unit.type.drawCell(unit); + float e = unit.elevation; + unit.elevation = 0f; + unit.type.draw(unit); + unit.elevation = e; //draw warning if(overlayTime > 0){