diff options
| author | darkvater <darkvater@openttd.org> | 2005-01-12 00:50:08 +0000 |
|---|---|---|
| committer | darkvater <darkvater@openttd.org> | 2005-01-12 00:50:08 +0000 |
| commit | ff23795f5be95d273c2168d71cbc25fa7fff1c3e (patch) | |
| tree | a7425691b62a7c765424debd5836b6b271338b0e | |
| parent | 1a450b0b39dc78b20c1df46c091534f8c4ad74a5 (diff) | |
| download | openttd-ff23795f5be95d273c2168d71cbc25fa7fff1c3e.tar.xz | |
(svn r1485) -Fix: [1031451] Catchment area shows when buying sign. Catchment area wasn't reset when road station window was unselected
-Fix: small GUI glitch in terraform toolbar
| -rw-r--r-- | road_gui.c | 23 | ||||
| -rw-r--r-- | terraform_gui.c | 2 |
2 files changed, 10 insertions, 15 deletions
diff --git a/road_gui.c b/road_gui.c index 263acb168..9633a1c3e 100644 --- a/road_gui.c +++ b/road_gui.c @@ -399,28 +399,23 @@ static void ShowRoadDepotPicker() AllocateWindowDesc(&_build_road_depot_desc); } -static void RoadStationPickerWndProc(Window *w, WindowEvent *e) { - - int rad; - +static void RoadStationPickerWndProc(Window *w, WindowEvent *e) +{ switch(e->event) { case WE_PAINT: { int image; + if (WP(w,def_d).close) return; + w->click_state = ((1<<3) << _road_station_picker_orientation) | ((1<<7) << _station_show_coverage); DrawWindowWidgets(w); - SetTileSelectSize(1, 1); - - if (_patches.modified_catchment) { - rad = CA_TRUCK; // = CA_BUS - } else { - rad = 4; - } - - if (_station_show_coverage) - SetTileSelectBigSize(-rad, -rad, 2*rad, 2*rad); + if (_station_show_coverage) { + int rad = _patches.modified_catchment ? CA_TRUCK /* = CA_BUS */ : 4; + SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad); + } else + SetTileSelectSize(1, 1); image = (w->window_class == WC_BUS_STATION) ? 0x47 : 0x43; diff --git a/terraform_gui.c b/terraform_gui.c index 90773869e..4186d9dcc 100644 --- a/terraform_gui.c +++ b/terraform_gui.c @@ -200,7 +200,7 @@ static const Widget _terraform_widgets[] = { }; static const WindowDesc _terraform_desc = { - 640-157, 22+36, 157, 36, + 640-157, 22+36, 158, 36, WC_SCEN_LAND_GEN,0, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON, _terraform_widgets, |