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

Merge branch 'infrastructure_sharing-sx' into jgrpp

Browse Source 
# Conflicts:
#	src/settings_type.h
#	src/table/settings.ini
This commit is contained in:
Jonathan G Rennison
2016-02-25 22:31:36 +00:00
parent 4722c81e88 1818a83e63
commit 7bc407e2f8
6 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/table/settings.ini
View File

@@ -1289,6 +1289,15 @@ strhelp = STR_CONFIG_SETTING_SHIP_COLLISION_AVOIDANCE_HELPTEXT
patxname = ""ship_collision_avoidance.vehicle.ship_collision_avoidance""
cat = SC_BASIC
[SDT_BOOL]
base = GameSettings
var = vehicle.no_train_crash_other_company
def = false
str = STR_CONFIG_SETTING_NO_TRAIN_CRASH_OTHER_COMPANY
strhelp = STR_CONFIG_SETTING_NO_TRAIN_CRASH_OTHER_COMPANY_HELPTEXT
extver = SlXvFeatureTest(XSLFTO_AND, XSLFI_INFRA_SHARING)
patxname = ""infra_sharing.vehicle.no_train_crash_other_company""
; station.join_stations
[SDT_NULL]
length = 1