diff options
| author | truelight <truelight@openttd.org> | 2006-08-26 16:34:03 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2006-08-26 16:34:03 +0000 |
| commit | db8dfcd6e90f13ed0aafec06fc5975967afb1bb5 (patch) | |
| tree | 7f558c2b1487df44a464aa980693e44cb438c592 /aircraft_gui.c | |
| parent | f73a2829f364b07d6f944b8b49e156b9774db39b (diff) | |
| download | openttd-db8dfcd6e90f13ed0aafec06fc5975967afb1bb5.tar.xz | |
(svn r6142) -Codechange: added WaypointID (sorry DV, couldn't splits it anymore)
-Codechange: introduced DestinationID, which is in fact an union of several types
Used in Order struct, so no longer StationID is abused for all targets.
Hangars are a big exception, as they use a station-id with GOTO_DEPOT (go figure)
Diffstat (limited to 'aircraft_gui.c')
| -rw-r--r-- | aircraft_gui.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/aircraft_gui.c b/aircraft_gui.c index c562de46d..4c4425e34 100644 --- a/aircraft_gui.c +++ b/aircraft_gui.c @@ -548,13 +548,14 @@ static void AircraftViewWndProc(Window *w, WindowEvent *e) } else { switch (v->current_order.type) { case OT_GOTO_STATION: { - SetDParam(0, v->current_order.station); + SetDParam(0, v->current_order.dest.station); SetDParam(1, v->cur_speed * 128 / 10); str = STR_HEADING_FOR_STATION + _patches.vehicle_speed; } break; case OT_GOTO_DEPOT: { - SetDParam(0, v->current_order.station); + /* Aircrafts always go to a station, even if you say depot */ + SetDParam(0, v->current_order.dest.station); SetDParam(1, v->cur_speed * 128 / 10); str = STR_HEADING_FOR_HANGAR + _patches.vehicle_speed; } break; @@ -960,7 +961,7 @@ static void DrawSmallOrderList(const Vehicle *v, int x, int y) sel--; if (order->type == OT_GOTO_STATION) { - SetDParam(0, order->station); + SetDParam(0, order->dest.station); DrawString(x, y, STR_A036, 0); y += 6; |