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

Tracerestrict: Reset dual instruction value when changing instruction type

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-03-08 20:25:42 +00:00
parent 8002f023cb
commit 119e24fe9d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/tracerestrict.cpp
View File

@@ -1777,13 +1777,16 @@ CommandCost CmdProgramSignalTraceRestrict(TileIndex tile, DoCommandFlag flags, u
if (IsTraceRestrictConditional(*old_item) != IsTraceRestrictConditional(item)) { if (IsTraceRestrictConditional(*old_item) != IsTraceRestrictConditional(item)) {
return_cmd_error(STR_TRACE_RESTRICT_ERROR_CAN_T_CHANGE_CONDITIONALITY); return_cmd_error(STR_TRACE_RESTRICT_ERROR_CAN_T_CHANGE_CONDITIONALITY);
} }
bool old_is_dual = IsTraceRestrictDoubleItem(*old_item); const TraceRestrictItem old_item_value = *old_item;
bool old_is_dual = IsTraceRestrictDoubleItem(old_item_value);
bool new_is_dual = IsTraceRestrictDoubleItem(item); bool new_is_dual = IsTraceRestrictDoubleItem(item);
*old_item = item; *old_item = item;
if (old_is_dual && !new_is_dual) { if (old_is_dual && !new_is_dual) {
items.erase(old_item + 1); items.erase(old_item + 1);
} else if (!old_is_dual && new_is_dual) { } else if (!old_is_dual && new_is_dual) {
items.insert(old_item + 1, GetDualInstructionInitialValue(item)); items.insert(old_item + 1, GetDualInstructionInitialValue(item));
} else if (old_is_dual && new_is_dual && GetTraceRestrictType(old_item_value) != GetTraceRestrictType(item)) {
*(old_item + 1) = GetDualInstructionInitialValue(item);
} }
break; break;
} }