From d9358efc3d63b8b55dc7d8e48e1d45c05ed87488 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 29 May 2022 21:04:02 +0100 Subject: [PATCH] VarAction2: Handle zero adjusts simple case in callback analyser --- src/newgrf_spritegroup.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/newgrf_spritegroup.cpp b/src/newgrf_spritegroup.cpp index 73b63e9659..53956b5e3c 100644 --- a/src/newgrf_spritegroup.cpp +++ b/src/newgrf_spritegroup.cpp @@ -286,9 +286,9 @@ void DeterministicSpriteGroup::AnalyseCallbacks(AnalyseCallbackOperation &op) co } auto check_1A_range = [&]() -> bool { - if (this->adjusts.size() == 1 && this->adjusts[0].variable == 0x1A) { + if (this->adjusts.size() == 0 || (this->adjusts.size() == 1 && this->adjusts[0].variable == 0x1A && (this->adjusts[0].operation == DSGA_OP_ADD || this->adjusts[0].operation == DSGA_OP_RST))) { /* Not clear why some GRFs do this, perhaps a way of commenting out a branch */ - uint32 value = EvaluateDeterministicSpriteGroupAdjust(this->size, this->adjusts[0], nullptr, 0, UINT_MAX); + uint32 value = (this->adjusts.size() == 1) ? EvaluateDeterministicSpriteGroupAdjust(this->size, this->adjusts[0], nullptr, 0, UINT_MAX) : 0; for (const auto &range : this->ranges) { if (range.low <= value && value <= range.high) { if (range.group != nullptr) range.group->AnalyseCallbacks(op);