(svn r12684) -Fix [FS#1891]: manually given service at depot order is not forgotten anymore when autoservice 'interferes'.
authorrubidium
Sun, 13 Apr 2008 11:35:57 +0000
changeset 10153 8e4ec1bbd946
parent 10152 919cffdd5d2e
child 10154 4ab34b8aad67
(svn r12684) -Fix [FS#1891]: manually given service at depot order is not forgotten anymore when autoservice 'interferes'.
src/vehicle.cpp
--- a/src/vehicle.cpp	Sun Apr 13 11:15:48 2008 +0000
+++ b/src/vehicle.cpp	Sun Apr 13 11:35:57 2008 +0000
@@ -137,7 +137,7 @@
 {
 	if (_patches.gotodepot && VehicleHasDepotOrders(this)) return false;
 	if (this->current_order.IsType(OT_LOADING))            return false;
-	if (this->current_order.IsType(OT_GOTO_DEPOT) && this->current_order.GetDepotActionType() & ODATFB_HALT) return false;
+	if (this->current_order.IsType(OT_GOTO_DEPOT) && this->current_order.GetDepotOrderType() != ODTFB_SERVICE) return false;
 	return NeedsServicing();
 }