cpp/openttd-patchpack/source Changeset - r5259:879d5ddf2469

Changeset - r5259:879d5ddf2469

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

bjarni - 17 years ago 2006-12-05 23:57:04
bjarni@openttd.org

(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)

4 files changed with 4 insertions and 0 deletions:

aircraft_cmd.c

roadveh_cmd.c

ship_cmd.c

train_cmd.c

0 comments (0 inline, 0 general)

aircraft_cmd.c

➞

Show inline comments

@@ @@ -558,6 +558,7 @@ int32 CmdSendAircraftToHangar(TileIndex @@
 			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)) {

roadveh_cmd.c

➞

Show inline comments

@@ @@ -420,6 +420,7 @@ int32 CmdSendRoadVehToDepot(TileIndex ti @@
 		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);

ship_cmd.c

➞

Show inline comments

@@ @@ -1030,6 +1030,7 @@ int32 CmdSendShipToDepot(TileIndex tile, @@
 		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);
+	}

train_cmd.c

➞

Show inline comments

@@ @@ -2050,6 +2050,7 @@ int32 CmdSendTrainToDepot(TileIndex tile @@
 		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)

0 comments (0 inline, 0 general)