petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
bjarni
2006-08-27 09:55:54 +00:00
parent 13addec466
commit 27534b3521
6 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
train_gui.c
View File

@@ -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);