From 2ae864f4d385f032f79424c3d0c44c960b693332 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 3 Jan 2021 12:43:15 -0500 Subject: [PATCH] Made logic processors reset variables on edit --- core/src/mindustry/editor/MapResizeDialog.java | 1 + core/src/mindustry/world/blocks/logic/LogicBlock.java | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/core/src/mindustry/editor/MapResizeDialog.java b/core/src/mindustry/editor/MapResizeDialog.java index afb0356bfa..9d961a4246 100644 --- a/core/src/mindustry/editor/MapResizeDialog.java +++ b/core/src/mindustry/editor/MapResizeDialog.java @@ -9,6 +9,7 @@ import mindustry.ui.dialogs.*; public class MapResizeDialog extends BaseDialog{ public static int minSize = 50, maxSize = 500, increment = 50; + int width, height; public MapResizeDialog(MapEditor editor, Intc2 cons){ diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java index 21d3534273..8a74a1d575 100644 --- a/core/src/mindustry/world/blocks/logic/LogicBlock.java +++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java @@ -317,17 +317,6 @@ public class LogicBlock extends Block{ asm.putConst("@links", executor.links.length); asm.putConst("@ipt", instructionsPerTick); - //store any older variables - for(Var var : executor.vars){ - boolean unit = var.name.equals("@unit"); - if(!var.constant || unit){ - BVar dest = asm.getVar(var.name); - if(dest != null && (!dest.constant || unit)){ - dest.value = var.isobj ? var.objval : var.numval; - } - } - } - //inject any extra variables if(assemble != null){ assemble.get(asm);