diff options
| author | belugas <belugas@openttd.org> | 2006-12-08 02:25:04 +0000 |
|---|---|---|
| committer | belugas <belugas@openttd.org> | 2006-12-08 02:25:04 +0000 |
| commit | d23210e0485f41a56bf40cdba61ed49194ee833f (patch) | |
| tree | 70e8fc65d43c0365042a1b551f3e51bd9794a04f | |
| parent | 088f4984ab55df36eae925f1b3f1e5ce0e3f5021 (diff) | |
| download | openttd-d23210e0485f41a56bf40cdba61ed49194ee833f.tar.xz | |
(svn r7432) -Fix(r7413) : The NO(cargo waiting) button of the StationList Window is now part of the cargo selection scheme. Again.
| -rw-r--r-- | station_gui.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/station_gui.c b/station_gui.c index 2e882bcfa..8c81cfaa6 100644 --- a/station_gui.c +++ b/station_gui.c @@ -35,7 +35,6 @@ enum StationListWidgets { STATIONLIST_WIDGET_SORTCRITERIA, STATIONLIST_WIDGET_SORTDROPBTN, CARGO_ALL_SELECTED = 0x1FFF, - CARGO_NONE_SELECTED = 0x1000, }; 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_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->flags = SL_REBUILD; @@ -424,7 +423,7 @@ static void PlayerStationsWndProc(Window *w, WindowEvent *e) for (i = 0; i < NUM_CARGO; i++) { LowerWindowWidget(w, i + STATIONLIST_WIDGET_CARGOSTART); } - RaiseWindowWidget(w, STATIONLIST_WIDGET_NOCARGOWAITING); + LowerWindowWidget(w, STATIONLIST_WIDGET_NOCARGOWAITING); LowerWindowWidget(w, STATIONLIST_WIDGET_CARGOALL); cargo_filter = CARGO_ALL_SELECTED; |