mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-27 23:11:12 -08:00
Code Issues Projects Releases Wiki Activity

Don't reset processors when links change

Browse source
This commit is contained in:
Anuken 2021-02-04 18:19:56 -05:00
parent c48034e420
commit 54754cd177
1 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

27
core/src/mindustry/world/blocks/logic/LogicBlock.java
View file

@ -64,7 +64,7 @@ public class LogicBlock extends Block{
entity.links.add(out);
}
entity.updateCode();
entity.updateCode(entity.code, true, null);
});
}
@ -277,15 +277,11 @@ public class LogicBlock extends Block{
return bname + outnum;
}
public void updateCode(){
updateCode(code);
}
public void updateCode(String str){
updateCodeVars(str, null);
updateCode(str, false, null);
}
public void updateCodeVars(String str, Cons<LAssembler> assemble){
public void updateCode(String str, boolean keep, Cons<LAssembler> assemble){
if(str != null){
code = str;
@ -317,6 +313,19 @@ public class LogicBlock extends Block{
asm.putConst("@links", executor.links.length);
asm.putConst("@ipt", instructionsPerTick);
if(keep){
//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);
@ -397,7 +406,7 @@ public class LogicBlock extends Block{
}
if(changed){
updateCode();
updateCode(code, true, null);
}
if(enabled){
@ -555,7 +564,7 @@ public class LogicBlock extends Block{
//skip memory, it isn't used anymore
read.skip(memory * 8);
updateCodeVars(code, asm -> {
updateCode(code, false, asm -> {
//load up the variables that were stored
for(int i = 0; i < varcount; i++){