mirror of https://github.com/OpenTTD/OpenTTD
(svn r7432) -Fix(r7413) : The NO(cargo waiting) button of the StationList Window is now part of the cargo selection scheme. Again.
parent
088f4984ab
commit
d23210e048
|
@ -35,7 +35,6 @@ enum StationListWidgets {
|
||||||
STATIONLIST_WIDGET_SORTCRITERIA,
|
STATIONLIST_WIDGET_SORTCRITERIA,
|
||||||
STATIONLIST_WIDGET_SORTDROPBTN,
|
STATIONLIST_WIDGET_SORTDROPBTN,
|
||||||
CARGO_ALL_SELECTED = 0x1FFF,
|
CARGO_ALL_SELECTED = 0x1FFF,
|
||||||
CARGO_NONE_SELECTED = 0x1000,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef int CDECL StationSortListingTypeFunction(const void*, const void*);
|
typedef int CDECL StationSortListingTypeFunction(const void*, const void*);
|
||||||
|
@ -277,7 +276,7 @@ static void PlayerStationsWndProc(Window *w, WindowEvent *e)
|
||||||
}
|
}
|
||||||
SetWindowWidgetLoweredState(w, STATIONLIST_WIDGET_FACILALL, facilities == (FACIL_TRAIN | FACIL_TRUCK_STOP | FACIL_BUS_STOP | FACIL_AIRPORT | FACIL_DOCK));
|
SetWindowWidgetLoweredState(w, STATIONLIST_WIDGET_FACILALL, facilities == (FACIL_TRAIN | FACIL_TRUCK_STOP | FACIL_BUS_STOP | FACIL_AIRPORT | FACIL_DOCK));
|
||||||
SetWindowWidgetLoweredState(w, STATIONLIST_WIDGET_CARGOALL, cargo_filter == CARGO_ALL_SELECTED);
|
SetWindowWidgetLoweredState(w, STATIONLIST_WIDGET_CARGOALL, cargo_filter == CARGO_ALL_SELECTED);
|
||||||
SetWindowWidgetLoweredState(w, STATIONLIST_WIDGET_NOCARGOWAITING, cargo_filter == CARGO_NONE_SELECTED);
|
SetWindowWidgetLoweredState(w, STATIONLIST_WIDGET_NOCARGOWAITING, HASBIT(cargo_filter, STATIONLIST_WIDGET_NOCARGOWAITING - NUM_CARGO));
|
||||||
|
|
||||||
sl->sort_list = NULL;
|
sl->sort_list = NULL;
|
||||||
sl->flags = SL_REBUILD;
|
sl->flags = SL_REBUILD;
|
||||||
|
@ -424,7 +423,7 @@ static void PlayerStationsWndProc(Window *w, WindowEvent *e)
|
||||||
for (i = 0; i < NUM_CARGO; i++) {
|
for (i = 0; i < NUM_CARGO; i++) {
|
||||||
LowerWindowWidget(w, i + STATIONLIST_WIDGET_CARGOSTART);
|
LowerWindowWidget(w, i + STATIONLIST_WIDGET_CARGOSTART);
|
||||||
}
|
}
|
||||||
RaiseWindowWidget(w, STATIONLIST_WIDGET_NOCARGOWAITING);
|
LowerWindowWidget(w, STATIONLIST_WIDGET_NOCARGOWAITING);
|
||||||
LowerWindowWidget(w, STATIONLIST_WIDGET_CARGOALL);
|
LowerWindowWidget(w, STATIONLIST_WIDGET_CARGOALL);
|
||||||
|
|
||||||
cargo_filter = CARGO_ALL_SELECTED;
|
cargo_filter = CARGO_ALL_SELECTED;
|
||||||
|
|
Loading…
Reference in New Issue