dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jgrpp' into jgrpp-nrt

Browse Source 
# Conflicts:
#	.ottdrev-vc
#	README.md
#	jgrpp-changelog.md
#	src/ship_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2019-08-24 10:41:08 +01:00
parent 7ed86e7488 12be6fd81f
commit 04ef407ddf
48 changed files with 568 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/build_vehicle_gui.cpp
View File

@@ -1082,9 +1082,6 @@ struct BuildVehicleWindow : Window {
this->GetWidget<NWidgetStacked>(WID_BV_BUILD_SEL)->SetDisplayedPlane(SZSP_NONE);
}
/* disable renaming engines in network games if you are not the server */
this->SetWidgetDisabledState(WID_BV_RENAME, _networking && !_network_server);
NWidgetCore *widget = this->GetWidget<NWidgetCore>(WID_BV_LIST);
widget->tool_tip = STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP + type;
@@ -1589,6 +1586,9 @@ struct BuildVehicleWindow : Window {
this->SetWidgetsDisabledState(this->sel_engine == INVALID_ENGINE, WID_BV_SHOW_HIDE, WID_BV_BUILD, WID_BV_RENAME, WIDGET_LIST_END);
/* disable renaming engines in network games if you are not the server */
this->SetWidgetDisabledState(WID_BV_RENAME, _networking && !(_network_server || _network_settings_access));
this->DrawWidgets();
if (!this->IsShaded()) {