# HG changeset patch # User darkvater # Date 1105491008 0 # Node ID ea47ad079de81ac267ab85fcc46b6c9fa344c8b8 # Parent 239603c9dd34620d3c5cae144cc6c9f3880a4aba (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 diff -r 239603c9dd34 -r ea47ad079de8 road_gui.c --- a/road_gui.c Tue Jan 11 23:39:21 2005 +0000 +++ b/road_gui.c Wed Jan 12 00:50:08 2005 +0000 @@ -399,28 +399,23 @@ 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 -r 239603c9dd34 -r ea47ad079de8 terraform_gui.c --- a/terraform_gui.c Tue Jan 11 23:39:21 2005 +0000 +++ b/terraform_gui.c Wed Jan 12 00:50:08 2005 +0000 @@ -200,7 +200,7 @@ }; 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,