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:
@@ -1546,7 +1546,7 @@ private:
|
||||
Order order;
|
||||
order.next = nullptr;
|
||||
order.index = 0;
|
||||
order.MakeGoToDepot(0, ODTFB_PART_OF_ORDERS,
|
||||
order.MakeGoToDepot(INVALID_DEPOT, ODTFB_PART_OF_ORDERS,
|
||||
(_settings_client.gui.new_nonstop || _settings_game.order.nonstop_only) && this->vehicle->IsGroundVehicle() ? ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS : ONSF_STOP_EVERYWHERE);
|
||||
order.SetDepotActionType(ODATFB_NEAREST_DEPOT);
|
||||
|
||||
|
Reference in New Issue
Block a user