From 4beca5e07d4fa7d2847a5005fdaea26c868e6bb8 Mon Sep 17 00:00:00 2001 From: DeltaNedas Date: Wed, 18 Nov 2020 23:22:11 +0000 Subject: [PATCH 1/2] add @mapx/y to logic processor --- core/src/mindustry/world/blocks/logic/LogicBlock.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java index 4ce500f9d4..62de78e151 100644 --- a/core/src/mindustry/world/blocks/logic/LogicBlock.java +++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java @@ -305,6 +305,8 @@ public class LogicBlock extends Block{ } } + asm.putConst("@mapx", world.width()); + asm.putConst("@mapy", world.height()); asm.putConst("@links", executor.links.length); asm.putConst("@ipt", instructionsPerTick); From a44ef1f063008cffd9cf445e948605f61a637e0e Mon Sep 17 00:00:00 2001 From: DeltaNedas Date: Thu, 19 Nov 2020 07:10:51 +0000 Subject: [PATCH 2/2] wh --- core/src/mindustry/world/blocks/logic/LogicBlock.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/world/blocks/logic/LogicBlock.java b/core/src/mindustry/world/blocks/logic/LogicBlock.java index 62de78e151..d5639562a5 100644 --- a/core/src/mindustry/world/blocks/logic/LogicBlock.java +++ b/core/src/mindustry/world/blocks/logic/LogicBlock.java @@ -305,8 +305,8 @@ public class LogicBlock extends Block{ } } - asm.putConst("@mapx", world.width()); - asm.putConst("@mapy", world.height()); + asm.putConst("@mapw", world.width()); + asm.putConst("@maph", world.height()); asm.putConst("@links", executor.links.length); asm.putConst("@ipt", instructionsPerTick);