diff options
| -rw-r--r-- | aircraft_cmd.c | 4 | ||||
| -rw-r--r-- | roadveh_cmd.c | 4 | ||||
| -rw-r--r-- | ship_cmd.c | 4 | ||||
| -rw-r--r-- | train_cmd.c | 4 | ||||
| -rw-r--r-- | vehicle_gui.c | 8 | ||||
| -rw-r--r-- | vehicle_gui.h | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/aircraft_cmd.c b/aircraft_cmd.c index 3a7d64a9d..d58ae4bb4 100644 --- a/aircraft_cmd.c +++ b/aircraft_cmd.c @@ -501,8 +501,8 @@ int32 CmdSendAircraftToHangar(TileIndex tile, uint32 flags, uint32 p1, uint32 p2 if (p2 & DEPOT_MASS_SEND) { /* Mass goto depot requested */ - if (!ValidVLWFlags(p2 & VLW_FLAGS)) return CMD_ERROR; - return SendAllVehiclesToDepot(VEH_Aircraft, flags, p2 & DEPOT_SERVICE, _current_player, (p2 & VLW_FLAGS), p1); + if (!ValidVLWFlags(p2 & VLW_MASK)) return CMD_ERROR; + return SendAllVehiclesToDepot(VEH_Aircraft, flags, p2 & DEPOT_SERVICE, _current_player, (p2 & VLW_MASK), p1); } if (!IsValidVehicleID(p1)) return CMD_ERROR; diff --git a/roadveh_cmd.c b/roadveh_cmd.c index 3b52f3ccd..202720fc6 100644 --- a/roadveh_cmd.c +++ b/roadveh_cmd.c @@ -368,8 +368,8 @@ int32 CmdSendRoadVehToDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (p2 & DEPOT_MASS_SEND) { /* Mass goto depot requested */ - if (!ValidVLWFlags(p2 & VLW_FLAGS)) return CMD_ERROR; - return SendAllVehiclesToDepot(VEH_Road, flags, p2 & DEPOT_SERVICE, _current_player, (p2 & VLW_FLAGS), p1); + if (!ValidVLWFlags(p2 & VLW_MASK)) return CMD_ERROR; + return SendAllVehiclesToDepot(VEH_Road, flags, p2 & DEPOT_SERVICE, _current_player, (p2 & VLW_MASK), p1); } if (!IsValidVehicleID(p1)) return CMD_ERROR; diff --git a/ship_cmd.c b/ship_cmd.c index f8cc1822d..b1bbf7faf 100644 --- a/ship_cmd.c +++ b/ship_cmd.c @@ -1011,8 +1011,8 @@ int32 CmdSendShipToDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (p2 & DEPOT_MASS_SEND) { /* Mass goto depot requested */ - if (!ValidVLWFlags(p2 & VLW_FLAGS)) return CMD_ERROR; - return SendAllVehiclesToDepot(VEH_Ship, flags, p2 & DEPOT_SERVICE, _current_player, (p2 & VLW_FLAGS), p1); + if (!ValidVLWFlags(p2 & VLW_MASK)) return CMD_ERROR; + return SendAllVehiclesToDepot(VEH_Ship, flags, p2 & DEPOT_SERVICE, _current_player, (p2 & VLW_MASK), p1); } if (!IsValidVehicleID(p1)) return CMD_ERROR; diff --git a/train_cmd.c b/train_cmd.c index 0b7d60b69..2f49981fc 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -1945,8 +1945,8 @@ int32 CmdSendTrainToDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (p2 & DEPOT_MASS_SEND) { /* Mass goto depot requested */ - if (!ValidVLWFlags(p2 & VLW_FLAGS)) return CMD_ERROR; - return SendAllVehiclesToDepot(VEH_Train, flags, p2 & DEPOT_SERVICE, _current_player, (p2 & VLW_FLAGS), p1); + if (!ValidVLWFlags(p2 & VLW_MASK)) return CMD_ERROR; + return SendAllVehiclesToDepot(VEH_Train, flags, p2 & DEPOT_SERVICE, _current_player, (p2 & VLW_MASK), p1); } if (!IsValidVehicleID(p1)) return CMD_ERROR; diff --git a/vehicle_gui.c b/vehicle_gui.c index b0c051a99..74d4955b6 100644 --- a/vehicle_gui.c +++ b/vehicle_gui.c @@ -1181,7 +1181,7 @@ void PlayerVehWndProc(Window *w, WindowEvent *e) switch (e->event) { case WE_CREATE: { - uint16 window_type = w->window_number & VLW_FLAGS; + uint16 window_type = w->window_number & VLW_MASK; vl->vehicle_type = GB(w->window_number, 11, 5); w->caption_color = GB(w->window_number, 0, 8); // PlayerID @@ -1248,7 +1248,7 @@ void PlayerVehWndProc(Window *w, WindowEvent *e) int i; const PlayerID owner = (PlayerID)w->caption_color; const Player *p = GetPlayer(owner); - const uint16 window_type = w->window_number & VLW_FLAGS; + const uint16 window_type = w->window_number & VLW_MASK; const StationID station = (window_type == VLW_STATION_LIST) ? GB(w->window_number, 16, 16) : INVALID_STATION; const OrderID order = (window_type == VLW_SHARED_ORDERS) ? GB(w->window_number, 16, 16) : INVALID_ORDER; @@ -1392,7 +1392,7 @@ void PlayerVehWndProc(Window *w, WindowEvent *e) assert(vl->l.list_length != 0); DoCommandP(0, GB(w->window_number, 16, 16) /* StationID or OrderID (depending on VLW). Nomatter which one it is, it's needed here */, - (w->window_number & VLW_FLAGS) | DEPOT_MASS_SEND | (_ctrl_pressed ? DEPOT_SERVICE : 0), NULL, CMD_SEND_TO_DEPOT(vl->vehicle_type)); + (w->window_number & VLW_MASK) | DEPOT_MASS_SEND | (_ctrl_pressed ? DEPOT_SERVICE : 0), NULL, CMD_SEND_TO_DEPOT(vl->vehicle_type)); break; case 10: // Right button @@ -1417,7 +1417,7 @@ void PlayerVehWndProc(Window *w, WindowEvent *e) case WE_TICK: /* resort the list every 20 seconds orso (10 days) */ if (--vl->l.resort_timer == 0) { - StationID station = ((w->window_number & VLW_FLAGS) == VLW_STATION_LIST) ? GB(w->window_number, 16, 16) : INVALID_STATION; + StationID station = ((w->window_number & VLW_MASK) == VLW_STATION_LIST) ? GB(w->window_number, 16, 16) : INVALID_STATION; PlayerID owner = (PlayerID)w->caption_color; DEBUG(misc, 1) ("Periodic resort %d list player %d station %d", vl->vehicle_type, owner, station); diff --git a/vehicle_gui.h b/vehicle_gui.h index 040d7cc0f..108f8f88e 100644 --- a/vehicle_gui.h +++ b/vehicle_gui.h @@ -17,10 +17,10 @@ void ResortVehicleLists(void); /* Vehicle List Window type flags */ enum { - VLW_FLAGS = (1 << 8)|(1 << 9)|(1 << 10), - VLW_STANDARD = 0, + VLW_STANDARD = 0 << 8, VLW_SHARED_ORDERS = 1 << 8, VLW_STATION_LIST = 2 << 8, + VLW_MASK = 0x700, }; static inline bool ValidVLWFlags(uint16 flags) |