--- a/aircraft_cmd.c Mon Sep 04 15:13:49 2006 +0000
+++ b/aircraft_cmd.c Mon Sep 04 15:16:58 2006 +0000
@@ -501,8 +501,8 @@
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;
--- a/roadveh_cmd.c Mon Sep 04 15:13:49 2006 +0000
+++ b/roadveh_cmd.c Mon Sep 04 15:16:58 2006 +0000
@@ -368,8 +368,8 @@
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;
--- a/ship_cmd.c Mon Sep 04 15:13:49 2006 +0000
+++ b/ship_cmd.c Mon Sep 04 15:16:58 2006 +0000
@@ -1011,8 +1011,8 @@
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;
--- a/train_cmd.c Mon Sep 04 15:13:49 2006 +0000
+++ b/train_cmd.c Mon Sep 04 15:16:58 2006 +0000
@@ -1945,8 +1945,8 @@
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;
--- a/vehicle_gui.c Mon Sep 04 15:13:49 2006 +0000
+++ b/vehicle_gui.c Mon Sep 04 15:16:58 2006 +0000
@@ -1181,7 +1181,7 @@
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 @@
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 @@
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 @@
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);
--- a/vehicle_gui.h Mon Sep 04 15:13:49 2006 +0000
+++ b/vehicle_gui.h Mon Sep 04 15:16:58 2006 +0000
@@ -17,10 +17,10 @@
/* 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)