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

Merge branch 'improved_breakdowns' into improved_breakdowns-sx

Browse Source 
# Conflicts:
#	src/saveload/vehicle_sl.cpp
#	src/table/settings.ini
This commit is contained in:
Jonathan G Rennison
2016-01-31 23:40:17 +00:00
parent 1678415aff e03d97eab6
commit fe2277dfbc
17 changed files with 128 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/table/settings.ini
View File

@@ -42,6 +42,7 @@ static bool InvalidateCompanyInfrastructureWindow(int32 p1);
static bool InvalidateCompanyWindow(int32 p1);
static bool ZoomMinMaxChanged(int32 p1);
static bool MaxVehiclesChanged(int32 p1);
static bool ImprovedBreakdownsSettingChanged(int32 p1);
#ifdef ENABLE_NETWORK
static bool UpdateClientName(int32 p1);
@@ -1144,6 +1145,7 @@ var = vehicle.improved_breakdowns
guiflags = SGF_NO_NETWORK
def = false
str = STR_CONFIG_SETTING_IMPROVED_BREAKDOWNS
proc = ImprovedBreakdownsSettingChanged
patxname = ""improved_breakdowns.vehicle.improved_breakdowns""
; station.join_stations