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

Tracerestrict: Remove TRSCOF_ACQUIRE_TRY_ON_RESERVE, same as TRSCOF_ACQUIRE_TRY

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-01-20 22:49:55 +00:00
parent fc51491361
commit d62ae41e03
10 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lang/extra/czech.txt
View File

@@ -829,7 +829,6 @@ STR_TRACE_RESTRICT_SPEED_ADAPTATION_CONTROL :úprava adaptac
STR_TRACE_RESTRICT_SIGNAL_MODE_CONTROL :úprava návěstního režimu
STR_TRACE_RESTRICT_SLOT_ACQUIRE_WAIT :vstoupit nebo počkat
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE :pokusit se o vstup
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ON_RES :pokusit se o vstup (při rezervaci)
STR_TRACE_RESTRICT_SLOT_RELEASE_FRONT :uvolnit (čelo vlaku)
STR_TRACE_RESTRICT_SLOT_RELEASE_BACK :uvolnit (konec vlaku)
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_ACQUIRE_WAIT :koncové PBS: vstoupit nebo počkat
@@ -837,7 +836,6 @@ STR_TRACE_RESTRICT_SLOT_PBS_RES_END_TRY_ACQUIRE :koncové PBS: p
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_RELEASE :koncové PBS: uvolnit
STR_TRACE_RESTRICT_SLOT_ACQUIRE_WAIT_ITEM :vstoupit do slotu {STRING}{BLACK}{STRING} nebo čekat u PBS návěstidla,
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ITEM :pokusit se o vstup do slotu {STRING}{BLACK}{STRING} a bez ohledu na výsledek pokračovat,
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ITEM_RES_ONLY :pokusit se o vstup do slotu {STRING}{BLACK}{STRING} (při PBS rezervaci) a bez ohledu na výsledek pokračovat,
STR_TRACE_RESTRICT_SLOT_RELEASE_FRONT_ITEM :uvolnit slot {STRING}{BLACK}{STRING} při průjezdu čela vlaku kolem návěstidla,
STR_TRACE_RESTRICT_SLOT_RELEASE_BACK_ITEM :uvolnit slot {STRING}{BLACK}{STRING} při průjezdu konce vlaku kolem návěstidla,
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_ACQUIRE_WAIT_ITEM :PBS rezervace končící zde: vstoupit do slotu {STRING}{BLACK}{STRING} nebo čekat u PBS návěstidla,

2
src/lang/extra/english.txt
View File

@@ -950,7 +950,6 @@ STR_TRACE_RESTRICT_SPEED_ADAPTATION_CONTROL :Speed adap. con
STR_TRACE_RESTRICT_SIGNAL_MODE_CONTROL :Signal mode control
STR_TRACE_RESTRICT_SLOT_ACQUIRE_WAIT :Acquire or wait
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE :Try to acquire
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ON_RES :Try to acquire (on reserve)
STR_TRACE_RESTRICT_SLOT_RELEASE_FRONT :Release (front)
STR_TRACE_RESTRICT_SLOT_RELEASE_BACK :Release (back)
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_ACQUIRE_WAIT :PBS end: Acquire or wait
@@ -958,7 +957,6 @@ STR_TRACE_RESTRICT_SLOT_PBS_RES_END_TRY_ACQUIRE :PBS end: Try to
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_RELEASE :PBS end: Release
STR_TRACE_RESTRICT_SLOT_ACQUIRE_WAIT_ITEM :Acquire slot: {STRING1}{BLACK}{STRING}, or wait at PBS signal
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ITEM :Try to acquire slot: {STRING1}{BLACK}{STRING}, or continue anyway
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ITEM_RES_ONLY :Try to acquire (on PBS reserve) slot: {STRING1}{BLACK}{STRING}, or continue anyway
STR_TRACE_RESTRICT_SLOT_RELEASE_FRONT_ITEM :Release slot: {STRING1}{BLACK}{STRING} (front of train)
STR_TRACE_RESTRICT_SLOT_RELEASE_BACK_ITEM :Release slot: {STRING1}{BLACK}{STRING} (back of train)
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_ACQUIRE_WAIT_ITEM :PBS reservation ending here: Acquire slot: {STRING1}{BLACK}{STRING}, or wait at start

2
src/lang/extra/galician.txt
View File

@@ -855,7 +855,6 @@ STR_TRACE_RESTRICT_SPEED_ADAPTATION_CONTROL :Control adaptat
STR_TRACE_RESTRICT_SIGNAL_MODE_CONTROL :Control do modo de sinal
STR_TRACE_RESTRICT_SLOT_ACQUIRE_WAIT :Adquirir ou agardar
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE :Intentar adquirir
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ON_RES :Intentar adquirir (en reserva)
STR_TRACE_RESTRICT_SLOT_RELEASE_FRONT :Liberar (diante)
STR_TRACE_RESTRICT_SLOT_RELEASE_BACK :Liberar (detrás)
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_ACQUIRE_WAIT :Fin PBS: Adquirir ou agardar
@@ -863,7 +862,6 @@ STR_TRACE_RESTRICT_SLOT_PBS_RES_END_TRY_ACQUIRE :Fin PBS: Intent
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_RELEASE :Fin PBS: Liberar
STR_TRACE_RESTRICT_SLOT_ACQUIRE_WAIT_ITEM :Adquirir slot: {STRING}{BLACK}{STRING}, ou agardar no sinal de ruta PBS
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ITEM :Intentar adquirir slot: {STRING}{BLACK}{STRING}, ou continuar de calquera xeito
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ITEM_RES_ONLY :Intentar adquirir (en reserva de ruta PBS) slot: {STRING}{BLACK}{STRING}, ou continuar de calquera xeito
STR_TRACE_RESTRICT_SLOT_RELEASE_FRONT_ITEM :Liberar slot: {STRING}{BLACK}{STRING} (diante do tren)
STR_TRACE_RESTRICT_SLOT_RELEASE_BACK_ITEM :Liberar slot: {STRING}{BLACK}{STRING} (detrás do tren)
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_ACQUIRE_WAIT_ITEM :Reserva de ruta PBS remata aqui: Adquirir slot: {STRING}{BLACK}{STRING}, ou agardar no sinal de ruta PBS

2
src/lang/extra/german.txt
View File

@@ -740,7 +740,6 @@ STR_TRACE_RESTRICT_SPEED_ADAPTATION_CONTROL :Konfiguration d
STR_TRACE_RESTRICT_SIGNAL_MODE_CONTROL :Konfiguration der Signalmodi
STR_TRACE_RESTRICT_SLOT_ACQUIRE_WAIT :erwerbe oder warte
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE :versuche zu erwerben
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ON_RES :versuche zu erwerben (bei Reservierung)
STR_TRACE_RESTRICT_SLOT_RELEASE_FRONT :löse (davor)
STR_TRACE_RESTRICT_SLOT_RELEASE_BACK :löse (dahinter)
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_ACQUIRE_WAIT :Pfadende: erwerbe oder warte
@@ -748,7 +747,6 @@ STR_TRACE_RESTRICT_SLOT_PBS_RES_END_TRY_ACQUIRE :Pfadende: versu
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_RELEASE :Pfadende: löse
STR_TRACE_RESTRICT_SLOT_ACQUIRE_WAIT_ITEM :Erwerbe Slot {STRING}{BLACK}{STRING}, oder warte am Pfadsignal
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ITEM :Versuche Slot {STRING}{BLACK}{STRING} zu erwerben, oder fahre weiter
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ITEM_RES_ONLY :Versuche Slot {STRING}{BLACK}{STRING} zu erwerben (bei Reservierung), oder fahre weiter
STR_TRACE_RESTRICT_SLOT_RELEASE_FRONT_ITEM :Löse Slot {STRING}{BLACK}{STRING} (vor dem Zug)
STR_TRACE_RESTRICT_SLOT_RELEASE_BACK_ITEM :Löse Slot {STRING}{BLACK}{STRING} (hinter dem Zug)
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_ACQUIRE_WAIT_ITEM :Pfadreservierung endet hier: Erwerbe Slot: {STRING}{BLACK}{STRING}, oder warte am Beginn

2
src/lang/extra/korean.txt
View File

@@ -855,7 +855,6 @@ STR_TRACE_RESTRICT_SPEED_ADAPTATION_CONTROL :속력 조절
STR_TRACE_RESTRICT_SIGNAL_MODE_CONTROL :사용할 신호 선택
STR_TRACE_RESTRICT_SLOT_ACQUIRE_WAIT :획득 또는 대기
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE :획득 시도
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ON_RES :(경로 예약 중에) 획득 시도
STR_TRACE_RESTRICT_SLOT_RELEASE_FRONT :해제 (앞)
STR_TRACE_RESTRICT_SLOT_RELEASE_BACK :해제 (뒤)
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_ACQUIRE_WAIT :경로 예약 종료: 획득 또는 대기
@@ -863,7 +862,6 @@ STR_TRACE_RESTRICT_SLOT_PBS_RES_END_TRY_ACQUIRE :경로 예약
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_RELEASE :경로 예약 종료: 해제
STR_TRACE_RESTRICT_SLOT_ACQUIRE_WAIT_ITEM :슬롯 획득: {STRING}{BLACK}{STRING}, 또는 경로 신호기에서 대기
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ITEM :슬롯 획득 시도: {STRING}{BLACK}{STRING}, 또는 계속하기
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ITEM_RES_ONLY :(경로 예약 중에) 슬롯 획득 시도: {STRING}{BLACK}{STRING}, 또는 계속하기
STR_TRACE_RESTRICT_SLOT_RELEASE_FRONT_ITEM :슬롯 해제: {STRING}{BLACK}{STRING} (열차의 앞)
STR_TRACE_RESTRICT_SLOT_RELEASE_BACK_ITEM :슬롯 해제: {STRING}{BLACK}{STRING} (열차의 뒤)
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_ACQUIRE_WAIT_ITEM :경로 예약 종료: 슬롯 획득: {STRING}{BLACK}{STRING}, 또는 입구에서 대기

2
src/lang/extra/simplified_chinese.txt
View File

@@ -848,7 +848,6 @@ STR_TRACE_RESTRICT_SPEED_ADAPTATION_CONTROL :速度调整控
STR_TRACE_RESTRICT_SIGNAL_MODE_CONTROL :信号模式控制
STR_TRACE_RESTRICT_SLOT_ACQUIRE_WAIT :捕获或等待
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE :尝试捕获
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ON_RES :尝试捕获 (保持)
STR_TRACE_RESTRICT_SLOT_RELEASE_FRONT :释放 (前)
STR_TRACE_RESTRICT_SLOT_RELEASE_BACK :释放 (后)
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_ACQUIRE_WAIT :路径结束: 捕获或等待
@@ -856,7 +855,6 @@ STR_TRACE_RESTRICT_SLOT_PBS_RES_END_TRY_ACQUIRE :路径结束:
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_RELEASE :路径结束: 释放
STR_TRACE_RESTRICT_SLOT_ACQUIRE_WAIT_ITEM :捕获条目: {STRING}{BLACK}{STRING}，或等待路径信号
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ITEM :尝试捕获条目: {STRING}{BLACK}{STRING}，或总是维持
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ITEM_RES_ONLY :尝试捕获 (当路径释放) 条目: {STRING}{BLACK}{STRING}，或总是维持
STR_TRACE_RESTRICT_SLOT_RELEASE_FRONT_ITEM :释放条目: {STRING}{BLACK}{STRING} (车前)
STR_TRACE_RESTRICT_SLOT_RELEASE_BACK_ITEM :释放条目: {STRING}{BLACK}{STRING} (车后)
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_ACQUIRE_WAIT_ITEM :路径预留在此结束: 捕获条目: {STRING}{BLACK}{STRING}，或在起点等待

4
src/sl/tracerestrict_sl.cpp
View File

@@ -81,6 +81,10 @@ static void Load_TRRP()
TraceRestrictItem &item = prog->items[i]; // note this is a reference
if (GetTraceRestrictType(item) == TRIT_SLOT) {
TraceRestrictSlotSubtypeField subtype = static_cast<TraceRestrictSlotSubtypeField>(GetTraceRestrictCondOp(item));
if (subtype == 7) {
/* Was TRSCOF_ACQUIRE_TRY_ON_RESERVE */
subtype = TRSCOF_ACQUIRE_TRY;
}
SetTraceRestrictCombinedAuxCondOpField(item, subtype);
}
if (IsTraceRestrictDoubleItem(item)) i++;

2
src/tracerestrict.cpp
View File

@@ -737,7 +737,6 @@ void TraceRestrictProgram::Execute(const Train* v, const TraceRestrictProgramInp
break;
case TRSCOF_ACQUIRE_TRY:
case TRSCOF_ACQUIRE_TRY_ON_RESERVE:
if (input.permitted_slot_operations & TRPISP_ACQUIRE) {
slot->Occupy(v->index);
} else if (input.permitted_slot_operations & TRPISP_ACQUIRE_TEMP_STATE) {
@@ -1355,7 +1354,6 @@ CommandCost TraceRestrictProgram::Validate(const std::vector<TraceRestrictItem>
break;
case TRSCOF_ACQUIRE_TRY:
case TRSCOF_ACQUIRE_TRY_ON_RESERVE:
actions_used_flags |= TRPAUF_SLOT_ACQUIRE;
break;

1
src/tracerestrict.h
View File

@@ -387,7 +387,6 @@ enum TraceRestrictSlotSubtypeField {
TRSCOF_PBS_RES_END_ACQ_WAIT = 4, ///< PBS reservations ending at this signal: acquire a slot, or wait
TRSCOF_PBS_RES_END_ACQ_TRY = 5, ///< PBS reservations ending at this signal: acquire a slot, or carry on otherwise
TRSCOF_PBS_RES_END_RELEASE = 6, ///< PBS reservations ending at this signal: release a slot
TRSCOF_ACQUIRE_TRY_ON_RESERVE = 7, ///< try to acquire a slot (on reserve), or carry on otherwise
/* space up to 31 */
};

6
src/tracerestrict_gui.cpp
View File

@@ -818,7 +818,6 @@ static const StringID _slot_op_subtypes_str[] = {
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_ACQUIRE_WAIT,
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_TRY_ACQUIRE,
STR_TRACE_RESTRICT_SLOT_PBS_RES_END_RELEASE,
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ON_RES,
INVALID_STRING_ID,
};
static const uint _slot_op_subtypes_val[] = {
@@ -829,7 +828,6 @@ static const uint _slot_op_subtypes_val[] = {
TRSCOF_PBS_RES_END_ACQ_WAIT,
TRSCOF_PBS_RES_END_ACQ_TRY,
TRSCOF_PBS_RES_END_RELEASE,
TRSCOF_ACQUIRE_TRY_ON_RESERVE,
};
/** slot op subtypes dropdown list set */
static const TraceRestrictDropDownListSet _slot_op_subtypes = {
@@ -1617,10 +1615,6 @@ static void DrawInstructionString(const TraceRestrictProgram *prog, TraceRestric
instruction_string = STR_TRACE_RESTRICT_SLOT_PBS_RES_END_RELEASE_ITEM;
break;
case TRSCOF_ACQUIRE_TRY_ON_RESERVE:
instruction_string = STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ITEM_RES_ONLY;
break;
default:
NOT_REACHED();
break;