From 7c2448ecea6ec47f9df4928ad3f42668936835ee Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 5 Dec 2004 12:43:04 +0000 Subject: (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. --- train_gui.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'train_gui.c') diff --git a/train_gui.c b/train_gui.c index 03593d388..7e3c89113 100644 --- a/train_gui.c +++ b/train_gui.c @@ -778,15 +778,15 @@ static void TrainViewWndProc(Window *w, WindowEvent *e) str = STR_TRAIN_STOPPING + _patches.vehicle_speed; } } else { - switch(v->next_order & OT_MASK) { + switch (v->current_order.type) { case OT_GOTO_STATION: { str = STR_HEADING_FOR_STATION + _patches.vehicle_speed; - SetDParam(0, v->next_order_param); + SetDParam(0, v->current_order.station); SetDParam(1, v->u.rail.last_speed * 10 >> 4); } break; case OT_GOTO_DEPOT: { - Depot *dep = &_depots[v->next_order_param]; + Depot *dep = &_depots[v->current_order.station]; SetDParam(0, dep->town_index); str = STR_HEADING_FOR_TRAIN_DEPOT + _patches.vehicle_speed; SetDParam(1, v->u.rail.last_speed * 10 >> 4); @@ -798,7 +798,7 @@ static void TrainViewWndProc(Window *w, WindowEvent *e) break; case OT_GOTO_WAYPOINT: { - SetDParam(0, v->next_order_param); + SetDParam(0, v->current_order.station); str = STR_HEADING_FOR_WAYPOINT + _patches.vehicle_speed; SetDParam(1, v->u.rail.last_speed * 10 >> 4); break; -- cgit v1.2.3-54-g00ecf