mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r6167) -Code cleanup r6161: replaced some uint16 with OrderID and (1 << 8) with SHARE_FLAG

release/0.5
bjarni 2006-08-27 09:55:54 +00:00
parent 13addec466
commit 27534b3521
6 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aircraft_gui.c
View File

@ -1009,10 +1009,10 @@ static const Widget _other_player_aircraft_widgets[] = {
static void PlayerAircraftWndProc(Window *w, WindowEvent *e) static void PlayerAircraftWndProc(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 */ /* 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 */ /* 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); PlayerID owner = GB(w->window_number, 0, 8);
vehiclelist_d *vl = &WP(w, vehiclelist_d); vehiclelist_d *vl = &WP(w, vehiclelist_d);
@ -1194,12 +1194,12 @@ static const WindowDesc _other_player_aircraft_desc = {
PlayerAircraftWndProc PlayerAircraftWndProc
}; };
void ShowPlayerAircraftLocal(PlayerID player, StationID station, uint16 order, bool show_shared) void ShowPlayerAircraftLocal(PlayerID player, StationID station, OrderID order, bool show_shared)
{ {
Window *w; Window *w;
if (show_shared) { if (show_shared) {
w = AllocateWindowDescFront(&_player_aircraft_desc, (order << 16) | (1 << 8)); w = AllocateWindowDescFront(&_player_aircraft_desc, (order << 16) | SHARE_FLAG);
} else { } else {
if (player == _local_player) { if (player == _local_player) {
w = AllocateWindowDescFront(&_player_aircraft_desc, (station << 16) | player); w = AllocateWindowDescFront(&_player_aircraft_desc, (station << 16) | player);

1
order.h
View File

@ -11,6 +11,7 @@
enum { enum {
INVALID_ORDER = 0xFFFF, INVALID_ORDER = 0xFFFF,
SHARE_FLAG = 1 << 8,
}; };
/* Order types */ /* Order types */

8
roadveh_gui.c
View File

@ -947,10 +947,10 @@ static const Widget _other_player_roadveh_widgets[] = {
static void PlayerRoadVehWndProc(Window *w, WindowEvent *e) static void PlayerRoadVehWndProc(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 */ /* 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 */ /* 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); PlayerID owner = GB(w->window_number, 0, 8);
vehiclelist_d *vl = &WP(w, vehiclelist_d); vehiclelist_d *vl = &WP(w, vehiclelist_d);
@ -1128,12 +1128,12 @@ static const WindowDesc _other_player_roadveh_desc = {
}; };
static void ShowPlayerRoadVehiclesLocal(PlayerID player, StationID station, uint16 order, bool show_shared) static void ShowPlayerRoadVehiclesLocal(PlayerID player, StationID station, OrderID order, bool show_shared)
{ {
Window *w; Window *w;
if (show_shared) { if (show_shared) {
w = AllocateWindowDescFront(&_player_roadveh_desc, (order << 16) | (1 << 8)); w = AllocateWindowDescFront(&_player_roadveh_desc, (order << 16) | SHARE_FLAG);
} else { } else {
if ( player == _local_player) { if ( player == _local_player) {
w = AllocateWindowDescFront(&_player_roadveh_desc, (station << 16) | player); w = AllocateWindowDescFront(&_player_roadveh_desc, (station << 16) | player);

6
ship_gui.c
View File

@ -956,10 +956,10 @@ static const Widget _other_player_ships_widgets[] = {
static void PlayerShipsWndProc(Window *w, WindowEvent *e) 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 */ /* 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 */ /* 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); PlayerID owner = GB(w->window_number, 0, 8);
vehiclelist_d *vl = &WP(w, vehiclelist_d); 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; Window *w;

8
train_gui.c
View File

@ -1406,10 +1406,10 @@ static const Widget _other_player_trains_widgets[] = {
static void PlayerTrainsWndProc(Window *w, WindowEvent *e) 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 */ /* 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 */ /* 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); PlayerID owner = GB(w->window_number, 0, 8);
vehiclelist_d *vl = &WP(w, vehiclelist_d); vehiclelist_d *vl = &WP(w, vehiclelist_d);
@ -1591,12 +1591,12 @@ static const WindowDesc _other_player_trains_desc = {
PlayerTrainsWndProc 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; Window *w;
if (show_shared) { if (show_shared) {
w = AllocateWindowDescFront(&_player_trains_desc, (order << 16) | (1 << 8)); w = AllocateWindowDescFront(&_player_trains_desc, (order << 16) | SHARE_FLAG);
} else { } else {
if (player == _local_player) { if (player == _local_player) {
w = AllocateWindowDescFront(&_player_trains_desc, (station << 16) | player); w = AllocateWindowDescFront(&_player_trains_desc, (station << 16) | player);

2
vehicle_gui.c
View File

@ -115,7 +115,7 @@ void ResortVehicleLists(void)
} }
} }
void BuildVehicleList(vehiclelist_d* vl, int type, PlayerID owner, StationID station, uint16 order) void BuildVehicleList(vehiclelist_d* vl, int type, PlayerID owner, StationID station, OrderID order)
{ {
const Vehicle** sort_list; const Vehicle** sort_list;
uint subtype = (type != VEH_Aircraft) ? Train_Front : 2; uint subtype = (type != VEH_Aircraft) ? Train_Front : 2;