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

Cleanup

Browse Source
This commit is contained in:
Anuken
2025-12-27 21:42:22 -05:00
parent 1a89fc9f8e
commit 8fb7aa34e3
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/mindustry/world/blocks/logic/LogicDisplay.java
View File

@@ -11,6 +11,7 @@ import arc.util.io.*;
import mindustry.*;
import mindustry.annotations.Annotations.*;
import mindustry.ctype.*;
import mindustry.game.EventType.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.logic.*;
@@ -42,6 +43,8 @@ public class LogicDisplay extends Block{
;
public static final Seq<LogicDisplayBuild> displays = new Seq<>(false);
/** When the content type of a draw command is this number, it counts as a display. */
public static final int displayDrawType = 30;
public static final float scaleStep = 0.05f;
@@ -50,6 +53,10 @@ public class LogicDisplay extends Block{
public int displaySize = 64;
public float scaleFactor = 1f;
static{
Events.on(ResetEvent.class, e -> displays.clear());
}
public LogicDisplay(String name){
super(name);
update = true;
@@ -173,8 +180,8 @@ public class LogicDisplay extends Block{
int packed = (DisplayCmd.p4(c) << 10) | DisplayCmd.p1(c);
int ctype = packed & 0x1F;
int id = packed >> 5;
if(ctype == 30){
if(id != index && id < displays.size && displays.get(id).buffer != null){
if(ctype == displayDrawType){
if(id != index && id < displays.size && id >= 0 && displays.get(id).buffer != null){
Tmp.tr1.set(displays.get(id).buffer.getTexture());
Draw.rect(Tmp.tr1, x, y, p2, p2, p3 + 90);
}