diff options
| author | tron <tron@openttd.org> | 2006-09-03 08:25:27 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2006-09-03 08:25:27 +0000 |
| commit | 1c21c645ae04601cd3711b37e6541d807cb727a7 (patch) | |
| tree | 79ebec494a87cd0b8e16e577740868f5bf90a7d2 /ship_gui.c | |
| parent | 302772883ce9dd965ca6dfe9ade85530c6de8210 (diff) | |
| download | openttd-1c21c645ae04601cd3711b37e6541d807cb727a7.tar.xz | |
(svn r6353) -Codechange: Make DestinationID a typedef of uin16, which is as large as any type of destinataion (StationID, DepotID, WaypointID) it can hold
DestinationID being a union of these types is just hassle without benefit and cannot be handled correctly everywhere because of local lack of information
Diffstat (limited to 'ship_gui.c')
| -rw-r--r-- | ship_gui.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ship_gui.c b/ship_gui.c index 602ade4df..5ac87ffb4 100644 --- a/ship_gui.c +++ b/ship_gui.c @@ -475,13 +475,13 @@ static void ShipViewWndProc(Window *w, WindowEvent *e) } else { switch (v->current_order.type) { case OT_GOTO_STATION: { - SetDParam(0, v->current_order.dest.station); + SetDParam(0, v->current_order.dest); SetDParam(1, v->cur_speed / 2); str = STR_HEADING_FOR_STATION + _patches.vehicle_speed; } break; case OT_GOTO_DEPOT: { - Depot *depot = GetDepot(v->current_order.dest.depot); + Depot *depot = GetDepot(v->current_order.dest); SetDParam(0, depot->town_index); SetDParam(1, v->cur_speed / 2); if (HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT)) { @@ -904,8 +904,8 @@ void DrawSmallOrderListShip(const Vehicle *v, int x, int y) sel--; if (order->type == OT_GOTO_STATION) { - if (!IsBuoy(GetStation(order->dest.station))){ - SetDParam(0, order->dest.station); + if (!IsBuoy(GetStation(order->dest))) { + SetDParam(0, order->dest); DrawString(x, y, STR_A036, 0); y += 6; |