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

Redundant field cleanup

Browse Source
This commit is contained in:
Anuken
2025-10-13 23:21:48 +09:00
parent 9edd31fad3
commit 46ee282fda
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/mindustry/editor/MapObjectivesCanvas.java
View File

@@ -284,7 +284,7 @@ public class MapObjectivesCanvas extends WidgetGroup{
} }
for(var other : children){ for(var other : children){
if(other instanceof ObjectiveTile tile && tile != ignore && Tmp.r2.set(tile.tx, tile.ty, objWidth, objHeight).overlaps(Tmp.r1)){ if(other instanceof ObjectiveTile tile && tile != ignore && Tmp.r2.set(tile.obj.editorX, tile.obj.editorY, objWidth, objHeight).overlaps(Tmp.r1)){
return false; return false;
} }
} }
@@ -340,7 +340,6 @@ public class MapObjectivesCanvas extends WidgetGroup{
public class ObjectiveTile extends Table{ public class ObjectiveTile extends Table{
public final MapObjective obj; public final MapObjective obj;
public int tx, ty;
public final Mover mover; public final Mover mover;
public final Connector conParent, conChildren; public final Connector conParent, conChildren;
@@ -392,8 +391,8 @@ public class MapObjectivesCanvas extends WidgetGroup{
} }
public void pos(int x, int y){ public void pos(int x, int y){
tx = obj.editorX = x; obj.editorX = x;
ty = obj.editorY = y; obj.editorY = y;
this.x = x * unitSize; this.x = x * unitSize;
this.y = y * unitSize; this.y = y * unitSize;
} }
@@ -439,8 +438,8 @@ public class MapObjectivesCanvas extends WidgetGroup{
moving = ObjectiveTile.this; moving = ObjectiveTile.this;
moving.toFront(); moving.toFront();
prevX = moving.tx; prevX = moving.obj.editorX;
prevY = moving.ty; prevY = moving.obj.editorY;
// Convert to world pos first because the button gets dragged too. // Convert to world pos first because the button gets dragged too.
Vec2 pos = event.listenerActor.localToStageCoordinates(Tmp.v1.set(x, y)); Vec2 pos = event.listenerActor.localToStageCoordinates(Tmp.v1.set(x, y));