Mercurial Mercurial > openttd-mini / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
(svn r7389) -Fix: when forcing a vehicle to go to a depot, clear refit orders from current orders (caused refit error popup when not having no orders)
authorbjarni
Tue, 05 Dec 2006 23:57:04 +0000
changeset 5259 9d7de9a6b364
parent 5258 28d07c40ea82
child 5260 e431715ad8aa
(svn r7389) -Fix: when forcing a vehicle to go to a depot, clear refit orders from current orders (caused refit error popup when not having no orders)
aircraft_cmd.c file | annotate | diff | comparison | revisions
roadveh_cmd.c file | annotate | diff | comparison | revisions
ship_cmd.c file | annotate | diff | comparison | revisions
train_cmd.c file | annotate | diff | comparison | revisions 
--- a/aircraft_cmd.c	Tue Dec 05 23:37:04 2006 +0000
+++ b/aircraft_cmd.c	Tue Dec 05 23:57:04 2006 +0000
@@ -558,6 +558,7 @@
 			v->current_order.type = OT_GOTO_DEPOT;
 			v->current_order.flags = OF_NON_STOP;
 			if (!(p2 & DEPOT_SERVICE)) SETBIT(v->current_order.flags, OFB_HALT_IN_DEPOT);
+			v->current_order.refit_cargo = CT_INVALID;
 			v->current_order.dest = next_airport_index;
 			InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
 			if (p2 & DEPOT_LOCATE_HANGAR || (p2 & DEPOT_SERVICE && v->u.air.state == FLYING && !next_airport_has_hangar)) {
--- a/roadveh_cmd.c	Tue Dec 05 23:37:04 2006 +0000
+++ b/roadveh_cmd.c	Tue Dec 05 23:57:04 2006 +0000
@@ -420,6 +420,7 @@
 		v->current_order.type = OT_GOTO_DEPOT;
 		v->current_order.flags = OF_NON_STOP;
 		if (!(p2 & DEPOT_SERVICE)) SETBIT(v->current_order.flags, OFB_HALT_IN_DEPOT);
+		v->current_order.refit_cargo = CT_INVALID;
 		v->current_order.dest = dep->index;
 		v->dest_tile = dep->xy;
 		InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
--- a/ship_cmd.c	Tue Dec 05 23:37:04 2006 +0000
+++ b/ship_cmd.c	Tue Dec 05 23:57:04 2006 +0000
@@ -1030,6 +1030,7 @@
 		v->current_order.type = OT_GOTO_DEPOT;
 		v->current_order.flags = OF_NON_STOP;
 		if (!(p2 & DEPOT_SERVICE)) SETBIT(v->current_order.flags, OFB_HALT_IN_DEPOT);
+		v->current_order.refit_cargo = CT_INVALID;
 		v->current_order.dest = dep->index;
 		InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
 	}
--- a/train_cmd.c	Tue Dec 05 23:37:04 2006 +0000
+++ b/train_cmd.c	Tue Dec 05 23:57:04 2006 +0000
@@ -2050,6 +2050,7 @@
 		v->current_order.flags = OF_NON_STOP;
 		if (!(p2 & DEPOT_SERVICE)) SETBIT(v->current_order.flags, OFB_HALT_IN_DEPOT);
 		v->current_order.dest = GetDepotByTile(tfdd.tile)->index;
+		v->current_order.refit_cargo = CT_INVALID;
 		InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, STATUS_BAR);
 		/* If there is no depot in front, reverse automatically */
 		if (tfdd.reverse)
openttd-mini