Mercurial > hg > openttd
diff src/train_cmd.cpp @ 6502:16523c579109 draft
(svn r9685) -Fix (r9683): Call v->LeaveStation() when a vehicle in a station is sent to a depot.
| author | maedhros <maedhros@openttd.org> |
|---|---|
| date | Fri, 20 Apr 2007 11:39:01 +0000 (2007-04-20) |
| parents | 696f0e1b046e |
| children | 0f78a0fe6568 |
line wrap: on
line diff
--- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -1985,6 +1985,8 @@ if (tfdd.best_length == (uint)-1) return_cmd_error(STR_883A_UNABLE_TO_FIND_ROUTE_TO); if (flags & DC_EXEC) { + if (v->current_order.type == OT_LOADING) v->LeaveStation(); + v->dest_tile = tfdd.tile; v->current_order.type = OT_GOTO_DEPOT; v->current_order.flags = OF_NON_STOP; @@ -1993,8 +1995,7 @@ 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) - DoCommand(v->tile, v->index, 0, DC_EXEC, CMD_REVERSE_TRAIN_DIRECTION); + if (tfdd.reverse) DoCommand(v->tile, v->index, 0, DC_EXEC, CMD_REVERSE_TRAIN_DIRECTION); } return 0;