summaryrefslogtreecommitdiff
path: root/ship_gui.c
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2006-08-27 09:55:54 +0000
committerbjarni <bjarni@openttd.org>2006-08-27 09:55:54 +0000
commit27534b352198f6c9c3eca51493f5685eb0e74b60 (patch)
treebc81977b36ba2b51906c35b5c658a0f08fde338a /ship_gui.c
parent13addec466543de725df9d40e8500af735b6816e (diff)
downloadopenttd-27534b352198f6c9c3eca51493f5685eb0e74b60.tar.xz
(svn r6167) -Code cleanup r6161: replaced some uint16 with OrderID and (1 << 8) with SHARE_FLAG
Diffstat (limited to 'ship_gui.c')
-rw-r--r--ship_gui.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ship_gui.c b/ship_gui.c
index bcaa8869d..01ae5f803 100644
--- a/ship_gui.c
+++ b/ship_gui.c
@@ -956,10 +956,10 @@ static const Widget _other_player_ships_widgets[] = {
static void PlayerShipsWndProc(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);
@@ -1142,7 +1142,7 @@ static const WindowDesc _other_player_ships_desc = {
};
-static void ShowPlayerShipsLocal(PlayerID player, StationID station, uint16 order, bool show_shared)
+static void ShowPlayerShipsLocal(PlayerID player, StationID station, OrderID order, bool show_shared)
{
Window *w;