diff options
| author | bjarni <bjarni@openttd.org> | 2006-08-27 09:55:54 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2006-08-27 09:55:54 +0000 |
| commit | 3af65b79e7ae13c7c03ed25635b60f7aeaccdccf (patch) | |
| tree | bc81977b36ba2b51906c35b5c658a0f08fde338a /train_gui.c | |
| parent | 1385d33ff0891111ffffefad182a778e653557ca (diff) | |
| download | openttd-3af65b79e7ae13c7c03ed25635b60f7aeaccdccf.tar.xz | |
(svn r6167) -Code cleanup r6161: replaced some uint16 with OrderID and (1 << 8) with SHARE_FLAG
Diffstat (limited to 'train_gui.c')
| -rw-r--r-- | train_gui.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/train_gui.c b/train_gui.c index 609434199..ae1759cf4 100644 --- a/train_gui.c +++ b/train_gui.c @@ -1406,10 +1406,10 @@ static const Widget _other_player_trains_widgets[] = { static void PlayerTrainsWndProc(Window *w, WindowEvent *e) { - uint16 order = GB(w->window_number, 16, 16); + OrderID order = GB(w->window_number, 16, 16); /* Sorting a shared order list relies on station being set to INVALID_STATION */ /* If station is not INVALID_STATION, then order is never used and we don't care what it contains */ - StationID station = HASBIT(w->window_number, 8) ? INVALID_STATION : order; + StationID station = (w->window_number & SHARE_FLAG) ? INVALID_STATION : order; PlayerID owner = GB(w->window_number, 0, 8); vehiclelist_d *vl = &WP(w, vehiclelist_d); @@ -1591,12 +1591,12 @@ static const WindowDesc _other_player_trains_desc = { PlayerTrainsWndProc }; -static void ShowPlayerTrainsLocal(PlayerID player, StationID station, uint16 order, bool show_shared) +static void ShowPlayerTrainsLocal(PlayerID player, StationID station, OrderID order, bool show_shared) { Window *w; if (show_shared) { - w = AllocateWindowDescFront(&_player_trains_desc, (order << 16) | (1 << 8)); + w = AllocateWindowDescFront(&_player_trains_desc, (order << 16) | SHARE_FLAG); } else { if (player == _local_player) { w = AllocateWindowDescFront(&_player_trains_desc, (station << 16) | player); |