diff options
| author | tron <tron@openttd.org> | 2004-12-05 12:43:04 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2004-12-05 12:43:04 +0000 |
| commit | 7c2448ecea6ec47f9df4928ad3f42668936835ee (patch) | |
| tree | f4ed902f473744cc8497d09b3f372d3da1524f4f /roadveh_gui.c | |
| parent | 1de8e294d892a70edbd1f4f3d3a6a141711f6648 (diff) | |
| download | openttd-7c2448ecea6ec47f9df4928ad3f42668936835ee.tar.xz | |
(svn r955) Replace uint16 for orders with struct Order
This adds no functionality, but is a stepping stone for future improvement (like 16bit order indices) and is easier to read.
This changes preserves binary compatibility wrt savegames.
Diffstat (limited to 'roadveh_gui.c')
| -rw-r--r-- | roadveh_gui.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roadveh_gui.c b/roadveh_gui.c index 610ebdb9f..b86ded196 100644 --- a/roadveh_gui.c +++ b/roadveh_gui.c @@ -204,15 +204,15 @@ static void RoadVehViewWndProc(Window *w, WindowEvent *e) } else if (v->vehstatus & VS_STOPPED) { str = STR_8861_STOPPED; } else { - switch(v->next_order & OT_MASK) { + switch (v->current_order.type) { case OT_GOTO_STATION: { - SetDParam(0, v->next_order_param); + SetDParam(0, v->current_order.station); SetDParam(1, v->cur_speed * 10 >> 5); str = STR_HEADING_FOR_STATION + _patches.vehicle_speed; } break; case OT_GOTO_DEPOT: { - Depot *dep = &_depots[v->next_order_param]; + Depot *dep = &_depots[v->current_order.station]; SetDParam(0, dep->town_index); SetDParam(1, v->cur_speed * 10 >> 5); str = STR_HEADING_FOR_ROAD_DEPOT + _patches.vehicle_speed; |