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

VarAction2: Avoid CB quick exit dropping CBID_RANDOM_TRIGGER callbacks

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-11-24 02:04:52 +00:00
parent e8de55adcb
commit bcb917d8c2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/newgrf_optimiser.cpp
View File

@@ -2545,9 +2545,11 @@ void OptimiseVarAction2DeterministicSpriteGroup(VarAction2OptimiseState &state,
if (!default_group_state.have_cb_handler && is_cb_switch) { if (!default_group_state.have_cb_handler && is_cb_switch) {
bool found_zero_value = false; bool found_zero_value = false;
bool found_non_zero_value = false; bool found_non_zero_value = false;
bool found_random_cb_value = false;
for (const auto &range : group->ranges) { for (const auto &range : group->ranges) {
if (range.low == 0) found_zero_value = true; if (range.low == 0) found_zero_value = true;
if (range.high > 0) found_non_zero_value = true; if (range.high > 0) found_non_zero_value = true;
if (range.low <= 1 && range.high >= 1) found_random_cb_value = true;
} }
if (!found_non_zero_value) { if (!found_non_zero_value) {
/* Group looks at var C but has no branches for non-zero cases, so don't consider it a callback handler. /* Group looks at var C but has no branches for non-zero cases, so don't consider it a callback handler.
@@ -2555,8 +2557,8 @@ void OptimiseVarAction2DeterministicSpriteGroup(VarAction2OptimiseState &state,
*/ */
possible_callback_handler = false; possible_callback_handler = false;
} }
if (!found_zero_value) { if (!found_zero_value && !found_random_cb_value) {
group->ranges.insert(group->ranges.begin(), { group->default_group, 0, 0 }); group->ranges.insert(group->ranges.begin(), { group->default_group, 0, 1 });
extern const CallbackResultSpriteGroup *NewCallbackResultSpriteGroupNoTransform(uint16 result); extern const CallbackResultSpriteGroup *NewCallbackResultSpriteGroupNoTransform(uint16 result);
group->default_group = NewCallbackResultSpriteGroupNoTransform(CALLBACK_FAILED); group->default_group = NewCallbackResultSpriteGroupNoTransform(CALLBACK_FAILED);
} }