Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove STR_JUST_STATION, it duplicates STR_STATION_NAME

Browse Source
This commit is contained in:
Jonathan G Rennison 2024-09-05 19:03:57 +01:00
parent aab79f6a93
commit 4bb0279c0a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,6 @@ STR_JUST_TT_TICKS :{TT_TICKS}
STR_JUST_TT_TICKS_LONG :{TT_TICKS_LONG} STR_JUST_TT_TICKS_LONG :{TT_TICKS_LONG}
STR_JUST_TT_TIME :{TT_TIME} STR_JUST_TT_TIME :{TT_TIME}
STR_JUST_TT_TIME_ABS :{TT_TIME_ABS} STR_JUST_TT_TIME_ABS :{TT_TIME_ABS}
STR_JUST_STATION :{STATION}
STR_RED_INT :{RED}{NUM} STR_RED_INT :{RED}{NUM}

4
src/order_gui.cpp
View File

@ -987,7 +987,7 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int
if (st == nullptr) { if (st == nullptr) {
sp.SetParam(index, STR_ORDER_CONDITIONAL_UNDEFINED_STATION); sp.SetParam(index, STR_ORDER_CONDITIONAL_UNDEFINED_STATION);
} else { } else {
sp.SetParam(index, STR_JUST_STATION); sp.SetParam(index, STR_STATION_NAME);
sp.SetParam(index + 1, st->index); sp.SetParam(index + 1, st->index);
} }
}; };
@ -1081,7 +1081,7 @@ void DrawOrderString(const Vehicle *v, const Order *order, int order_index, int
if (via_st == nullptr) { if (via_st == nullptr) {
tmp_params.SetParam(4, STR_ORDER_CONDITIONAL_UNDEFINED_STATION); tmp_params.SetParam(4, STR_ORDER_CONDITIONAL_UNDEFINED_STATION);
} else { } else {
tmp_params.SetParam(4, STR_JUST_STATION); tmp_params.SetParam(4, STR_STATION_NAME);
tmp_params.SetParam(5, via_st->index); tmp_params.SetParam(5, via_st->index);
} }
tmp_params.SetParam(6, STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS + order->GetConditionComparator()); tmp_params.SetParam(6, STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS + order->GetConditionComparator());