dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VarAction2: Add a JNZ op analogous to JZ for OR ops

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-07-30 22:40:41 +01:00
parent 5ec802a3d4
commit cbc6199542
3 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/newgrf_spritegroup.cpp
View File

@@ -212,6 +212,16 @@ static U EvalAdjustT(const DeterministicSpriteGroupAdjust &adjust, ScopeResolver
return last_value;
}
}
case DSGA_OP_JNZ: {
if (value != 0 && adjust_iter != nullptr) {
/* Jump */
(*adjust_iter) += adjust.jump;
return value;
} else {
/* Don't jump */
return last_value;
}
}
default: return value;
}
}
@@ -700,6 +710,7 @@ static const char *_dsg_op_special_names[] {
"STO_NC",
"ABS",
"JZ",
"JNZ",
};
static_assert(lengthof(_dsg_op_special_names) == DSGA_OP_SPECIAL_END - DSGA_OP_TERNARY);
@@ -753,7 +764,7 @@ static char *DumpSpriteGroupAdjust(char *p, const char *last, const Deterministi
}
};
if (adjust.operation == DSGA_OP_JZ) {
if (IsEvalAdjustJumpOperation(adjust.operation)) {
conditional_indent++;
}
if (adjust.adjust_flags & DSGAF_END_BLOCK) {
@@ -801,7 +812,7 @@ static char *DumpSpriteGroupAdjust(char *p, const char *last, const Deterministi
}
p += seprintf(p, last, ", op: ");
p = GetAdjustOperationName(p, last, adjust.operation);
if (adjust.operation == DSGA_OP_JZ) {
if (IsEvalAdjustJumpOperation(adjust.operation)) {
p += seprintf(p, last, " +%u", adjust.jump);
}
append_flags();