From f399fc040fbb527a4dac54a7389009adda8a4717 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 17 Dec 2023 16:38:31 +0000 Subject: [PATCH] VarAction2: Don't set skip CB flag if NGOF_NO_OPT_VARACT2_CB_QUICK_EXIT set --- src/newgrf_optimiser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/newgrf_optimiser.cpp b/src/newgrf_optimiser.cpp index b27684689b..6c89c98b87 100644 --- a/src/newgrf_optimiser.cpp +++ b/src/newgrf_optimiser.cpp @@ -2751,7 +2751,7 @@ void OptimiseVarAction2DeterministicSpriteGroup(VarAction2OptimiseState &state, } if (possible_callback_handler) group->dsg_flags |= DSGF_CB_HANDLER; - if ((group->dsg_flags & (DSGF_CB_HANDLER | DSGF_CB_RESULT)) == 0) { + if ((group->dsg_flags & (DSGF_CB_HANDLER | DSGF_CB_RESULT)) == 0 && !HasGrfOptimiserFlag(NGOF_NO_OPT_VARACT2_CB_QUICK_EXIT)) { group->sg_flags |= SGF_SKIP_CB; }