Merge branch 'master' into jgrpp
# Conflicts: # src/depot_type.h # src/lang/german.txt # src/order_gui.cpp # src/pathfinder/yapf/yapf_rail.cpp # src/script/api/script_window.hpp.in # src/settings_table.cpp # src/train_cmd.cpp
This commit is contained in:
@@ -3765,7 +3765,7 @@ public:
|
||||
SetDParam(0, v->type);
|
||||
SetDParam(1, v->current_order.GetDestination());
|
||||
SetDParam(2, v->GetDisplaySpeed());
|
||||
if (v->current_order.GetDepotActionType() & ODATFB_NEAREST_DEPOT) {
|
||||
if (v->current_order.GetDestination() == INVALID_DEPOT) {
|
||||
/* This case *only* happens when multiple nearest depot orders
|
||||
* follow each other (including an order list only one order: a
|
||||
* nearest depot order) and there are no reachable depots.
|
||||
|
Reference in New Issue
Block a user