mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r20856) -Fix [FS#4141]: Road/water toolbars did not get updated when the first vehicle of their type becomes available.

release/1.1
terkhen 2010-09-28 21:58:06 +00:00
parent 97c0b40ab7
commit 897bb71621
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dock_gui.cpp
View File

@ -173,6 +173,7 @@ struct BuildDocksToolbarWindow : Window {
BuildDocksToolbarWindow(const WindowDesc *desc, WindowNumber window_number) : Window() BuildDocksToolbarWindow(const WindowDesc *desc, WindowNumber window_number) : Window()
{ {
this->InitNested(desc, window_number); this->InitNested(desc, window_number);
this->OnInvalidateData();
if (_settings_client.gui.link_terraform_toolbar) ShowTerraformToolbar(this); if (_settings_client.gui.link_terraform_toolbar) ShowTerraformToolbar(this);
} }
@ -181,9 +182,17 @@ struct BuildDocksToolbarWindow : Window {
if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0, false); if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0, false);
} }
void OnInvalidateData(int data = 0)
{
this->SetWidgetsDisabledState(!CanBuildVehicleInfrastructure(VEH_SHIP),
DTW_DEPOT,
DTW_STATION,
DTW_BUOY,
WIDGET_LIST_END);
}
virtual void OnPaint() virtual void OnPaint()
{ {
this->SetWidgetsDisabledState(!CanBuildVehicleInfrastructure(VEH_SHIP), DTW_DEPOT, DTW_STATION, DTW_BUOY, WIDGET_LIST_END);
this->DrawWidgets(); this->DrawWidgets();
} }

8
src/engine.cpp
View File

@ -605,6 +605,10 @@ static void AcceptEnginePreview(EngineID eid, CompanyID company)
if (company == _local_company) { if (company == _local_company) {
AddRemoveEngineFromAutoreplaceAndBuildWindows(e->type); AddRemoveEngineFromAutoreplaceAndBuildWindows(e->type);
} }
/* Update the toolbar. */
if (e->type == VEH_ROAD) InvalidateWindowData(WC_BUILD_TOOLBAR, TRANSPORT_ROAD);
if (e->type == VEH_SHIP) InvalidateWindowData(WC_BUILD_TOOLBAR, TRANSPORT_WATER);
} }
/** /**
@ -749,6 +753,10 @@ static void NewVehicleAvailable(Engine *e)
SetDParam(0, GetEngineCategoryName(index)); SetDParam(0, GetEngineCategoryName(index));
SetDParam(1, index); SetDParam(1, index);
AddNewsItem(STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE, NS_NEW_VEHICLES, NR_ENGINE, index); AddNewsItem(STR_NEWS_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE, NS_NEW_VEHICLES, NR_ENGINE, index);
/* Update the toolbar. */
if (e->type == VEH_ROAD) InvalidateWindowData(WC_BUILD_TOOLBAR, TRANSPORT_ROAD);
if (e->type == VEH_SHIP) InvalidateWindowData(WC_BUILD_TOOLBAR, TRANSPORT_WATER);
} }
void EnginesMonthlyLoop() void EnginesMonthlyLoop()

15
src/road_gui.cpp
View File

@ -457,11 +457,7 @@ struct BuildRoadToolbarWindow : Window {
RTW_ONE_WAY, RTW_ONE_WAY,
WIDGET_LIST_END); WIDGET_LIST_END);
this->SetWidgetsDisabledState(!CanBuildVehicleInfrastructure(VEH_ROAD), this->OnInvalidateData();
RTW_DEPOT,
RTW_BUS_STATION,
RTW_TRUCK_STATION,
WIDGET_LIST_END);
if (_settings_client.gui.link_terraform_toolbar) ShowTerraformToolbar(this); if (_settings_client.gui.link_terraform_toolbar) ShowTerraformToolbar(this);
} }
@ -471,6 +467,15 @@ struct BuildRoadToolbarWindow : Window {
if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0, false); if (_settings_client.gui.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0, false);
} }
void OnInvalidateData(int data = 0)
{
this->SetWidgetsDisabledState(!CanBuildVehicleInfrastructure(VEH_ROAD),
RTW_DEPOT,
RTW_BUS_STATION,
RTW_TRUCK_STATION,
WIDGET_LIST_END);
}
/** /**
* Update the remove button lowered state of the road toolbar * Update the remove button lowered state of the road toolbar
* *