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

Merge branch 'master' into auto_timetables

Browse Source
This commit is contained in:
Jonathan G Rennison
2015-08-09 17:07:41 +01:00
parent 0ebf8b6b0b a9200aa69a
commit 15c2327fd4
242 changed files with 5938 additions and 4594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/table/settings.ini
View File

@@ -28,6 +28,7 @@ static bool TownFoundingChanged(int32 p1);
static bool DifficultyNoiseChange(int32 i);
static bool MaxNoAIsChange(int32 i);
static bool CheckRoadSide(int p1);
static bool ChangeMaxHeightLevel(int32 p1);
static bool CheckFreeformEdges(int32 p1);
static bool ChangeDynamicEngines(int32 p1);
static bool StationCatchmentChanged(int32 p1);
@@ -40,6 +41,7 @@ static bool RedrawTownAuthority(int32 p1);
static bool InvalidateCompanyInfrastructureWindow(int32 p1);
static bool InvalidateCompanyWindow(int32 p1);
static bool ZoomMinMaxChanged(int32 p1);
static bool MaxVehiclesChanged(int32 p1);
#ifdef ENABLE_NETWORK
static bool UpdateClientName(int32 p1);
@@ -400,7 +402,7 @@ base = GameSettings
var = construction.max_heightlevel
type = SLE_UINT8
from = 194
guiflags = SGF_NEWGAME_ONLY | SGF_NO_NETWORK
guiflags = SGF_NEWGAME_ONLY | SGF_SCENEDIT_TOO
def = DEF_MAX_HEIGHTLEVEL
min = MIN_MAX_HEIGHTLEVEL
max = MAX_MAX_HEIGHTLEVEL
@@ -408,6 +410,7 @@ interval = 1
str = STR_CONFIG_SETTING_MAX_HEIGHTLEVEL
strhelp = STR_CONFIG_SETTING_MAX_HEIGHTLEVEL_HELPTEXT
strval = STR_JUST_INT
proc = ChangeMaxHeightLevel
cat = SC_BASIC
[SDT_BOOL]
@@ -977,7 +980,7 @@ max = 5000
str = STR_CONFIG_SETTING_MAX_TRAINS
strhelp = STR_CONFIG_SETTING_MAX_TRAINS_HELPTEXT
strval = STR_JUST_COMMA
proc = RedrawScreen
proc = MaxVehiclesChanged
cat = SC_BASIC
[SDT_VAR]
@@ -990,7 +993,7 @@ max = 5000
str = STR_CONFIG_SETTING_MAX_ROAD_VEHICLES
strhelp = STR_CONFIG_SETTING_MAX_ROAD_VEHICLES_HELPTEXT
strval = STR_JUST_COMMA
proc = RedrawScreen
proc = MaxVehiclesChanged
cat = SC_BASIC
[SDT_VAR]
@@ -1003,7 +1006,7 @@ max = 5000
str = STR_CONFIG_SETTING_MAX_AIRCRAFT
strhelp = STR_CONFIG_SETTING_MAX_AIRCRAFT_HELPTEXT
strval = STR_JUST_COMMA
proc = RedrawScreen
proc = MaxVehiclesChanged
cat = SC_BASIC
[SDT_VAR]
@@ -1016,7 +1019,7 @@ max = 5000
str = STR_CONFIG_SETTING_MAX_SHIPS
strhelp = STR_CONFIG_SETTING_MAX_SHIPS_HELPTEXT
strval = STR_JUST_COMMA
proc = RedrawScreen
proc = MaxVehiclesChanged
cat = SC_BASIC
[SDTG_BOOL]
@@ -2193,8 +2196,8 @@ type = SLE_UINT8
from = 30
guiflags = SGF_MULTISTRING | SGF_NEWGAME_ONLY
def = 1
min = 0
max = 3
min = TGEN_SMOOTHNESS_BEGIN
max = TGEN_SMOOTHNESS_END - 1
str = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN
strhelp = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_HELPTEXT
strval = STR_CONFIG_SETTING_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH
@@ -3525,12 +3528,12 @@ strval = STR_CONFIG_SETTING_NEWS_MESSAGES_OFF
[SDTC_VAR]
ifdef = ENABLE_NETWORK
var = gui.network_chat_box_width
var = gui.network_chat_box_width_pct
type = SLE_UINT16
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
def = 620
min = 200
max = 65535
def = 40
min = 10
max = 100
cat = SC_EXPERT
[SDTC_VAR]