cpp/openttd-patchpack/source File Diff

File diff r17554:5c50ac4e916a → r17555:968dbbbb3b04

src/vehicle.cpp

➞

Show inline comments

@@ @@ -1986,6 +1986,11 @@ CommandCost Vehicle::SendToDepot(DoComma @@
 			 * then skip to the next order; effectively cancelling this forced service */
 			if (this->current_order.GetDepotOrderType() & ODTFB_PART_OF_ORDERS) this->IncrementRealOrderIndex();
 			if (this->IsGroundVehicle()) {
 				uint16 &gv_flags = this->GetGroundVehicleFlags();
 				SetBit(gv_flags, GVF_SUPPRESS_AUTOMATIC_ORDERS);
+			}
 			this->current_order.MakeDummy();
 			SetWindowWidgetDirty(WC_VEHICLE_VIEW, this->index, VVW_WIDGET_START_STOP_VEH);
+		}
@@ @@ -2001,6 +2006,11 @@ CommandCost Vehicle::SendToDepot(DoComma @@
 	if (flags & DC_EXEC) {
 		if (this->current_order.IsType(OT_LOADING)) this->LeaveStation();
 		if (this->IsGroundVehicle()) {
 			uint16 &gv_flags = this->GetGroundVehicleFlags();
 			SetBit(gv_flags, GVF_SUPPRESS_AUTOMATIC_ORDERS);
+		}
 		this->dest_tile = location;
 		this->current_order.MakeGoToDepot(destination, ODTF_MANUAL);
 		if (!(command & DEPOT_SERVICE)) this->current_order.SetDepotActionType(ODATFB_HALT);