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

Tracerestrict: Add enum type for TRIT_LONG_RESERVE values

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-10-03 18:11:41 +01:00
parent 4280c413a6
commit b299c4dce8
3 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/tracerestrict.cpp
View File

@@ -678,10 +678,18 @@ void TraceRestrictProgram::Execute(const Train* v, const TraceRestrictProgramInp
break; break;
case TRIT_LONG_RESERVE: case TRIT_LONG_RESERVE:
if (GetTraceRestrictValue(item)) { switch (static_cast<TraceRestrictLongReserveValueField>(GetTraceRestrictValue(item))) {
out.flags &= ~TRPRF_LONG_RESERVE; case TRLRVF_LONG_RESERVE:
} else { out.flags |= TRPRF_LONG_RESERVE;
out.flags |= TRPRF_LONG_RESERVE; break;
case TRLRVF_CANCEL_LONG_RESERVE:
out.flags &= ~TRPRF_LONG_RESERVE;
break;
default:
NOT_REACHED();
break;
} }
break; break;

10
src/tracerestrict.h
View File

@@ -269,6 +269,14 @@ enum TraceRestrictTargetDirectionCondAuxField {
/* space up to 3 */ /* space up to 3 */
}; };
/**
* TraceRestrictItem value field, for TRIT_LONG_RESERVE
*/
enum TraceRestrictLongReserveValueField {
TRLRVF_LONG_RESERVE = 0, ///< Long reserve
TRLRVF_CANCEL_LONG_RESERVE = 1, ///< Cancel long reserve
};
/** /**
* TraceRestrictItem value field, for TRIT_WAIT_AT_PBS * TraceRestrictItem value field, for TRIT_WAIT_AT_PBS
*/ */
@@ -697,7 +705,7 @@ enum TraceRestrictValueType {
TRVT_TILE_INDEX = 8, ///< takes a TileIndex in the next item slot TRVT_TILE_INDEX = 8, ///< takes a TileIndex in the next item slot
TRVT_PF_PENALTY = 9, ///< takes a pathfinder penalty value or preset index, as per the auxiliary field as type: TraceRestrictPathfinderPenaltyAuxField TRVT_PF_PENALTY = 9, ///< takes a pathfinder penalty value or preset index, as per the auxiliary field as type: TraceRestrictPathfinderPenaltyAuxField
TRVT_RESERVE_THROUGH = 10,///< takes a value 0 = reserve through, 1 = cancel previous reserve through TRVT_RESERVE_THROUGH = 10,///< takes a value 0 = reserve through, 1 = cancel previous reserve through
TRVT_LONG_RESERVE = 11,///< takes a value 0 = long reserve, 1 = cancel previous long reserve TRVT_LONG_RESERVE = 11,///< takes a TraceRestrictLongReserveValueField
TRVT_GROUP_INDEX = 12,///< takes a GroupID TRVT_GROUP_INDEX = 12,///< takes a GroupID
TRVT_WEIGHT = 13,///< takes a weight TRVT_WEIGHT = 13,///< takes a weight
TRVT_POWER = 14,///< takes a power TRVT_POWER = 14,///< takes a power

16
src/tracerestrict_gui.cpp
View File

@@ -1545,7 +1545,19 @@ static void DrawInstructionString(const TraceRestrictProgram *prog, TraceRestric
break; break;
case TRIT_LONG_RESERVE: case TRIT_LONG_RESERVE:
instruction_string = GetTraceRestrictValue(item) ? STR_TRACE_RESTRICT_LONG_RESERVE_CANCEL : STR_TRACE_RESTRICT_LONG_RESERVE; switch (static_cast<TraceRestrictLongReserveValueField>(GetTraceRestrictValue(item))) {
case TRLRVF_LONG_RESERVE:
instruction_string = STR_TRACE_RESTRICT_LONG_RESERVE;
break;
case TRLRVF_CANCEL_LONG_RESERVE:
instruction_string = STR_TRACE_RESTRICT_LONG_RESERVE_CANCEL;
break;
default:
NOT_REACHED();
break;
}
break; break;
case TRIT_WAIT_AT_PBS: case TRIT_WAIT_AT_PBS:
@@ -3180,7 +3192,7 @@ private:
right_sel->SetDisplayedPlane(DPR_VALUE_DROPDOWN); right_sel->SetDisplayedPlane(DPR_VALUE_DROPDOWN);
this->EnableWidget(TR_WIDGET_VALUE_DROPDOWN); this->EnableWidget(TR_WIDGET_VALUE_DROPDOWN);
this->GetWidget<NWidgetCore>(TR_WIDGET_VALUE_DROPDOWN)->widget_data = this->GetWidget<NWidgetCore>(TR_WIDGET_VALUE_DROPDOWN)->widget_data =
GetTraceRestrictValue(item) ? STR_TRACE_RESTRICT_LONG_RESERVE_CANCEL : STR_TRACE_RESTRICT_LONG_RESERVE; GetDropDownStringByValue(&_long_reserve_value, GetTraceRestrictValue(item));
break; break;
case TRVT_WAIT_AT_PBS: case TRVT_WAIT_AT_PBS: