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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	config.lib
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/aircraft_cmd.cpp
#	src/base_station_base.h
#	src/core/pool_type.hpp
#	src/disaster_vehicle.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/group.h
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/network_command.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2020-01-06 18:45:51 +00:00
parent 7afa667e66 5b52f25902
commit 7960db35f2
281 changed files with 2714 additions and 2467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/table/settings.ini
View File

@@ -57,6 +57,9 @@ static bool CheckSharingRail(int32 p1);
static bool CheckSharingRoad(int32 p1);
static bool CheckSharingWater(int32 p1);
static bool CheckSharingAir(int32 p1);
extern int32 _old_ending_year_slv_105;
/* End - Callback Functions for the various settings */
/* Begin - GUI order callbacks */
@@ -2036,6 +2039,7 @@ guiflags = SGF_NO_NETWORK
def = DEF_SNOWLINE_HEIGHT
min = MIN_SNOWLINE_HEIGHT
max = MAX_SNOWLINE_HEIGHT
interval = 1
str = STR_CONFIG_SETTING_SNOWLINE_HEIGHT
strhelp = STR_CONFIG_SETTING_SNOWLINE_HEIGHT_HELPTEXT
strval = STR_JUST_COMMA
@@ -2073,9 +2077,30 @@ str = STR_CONFIG_SETTING_STARTING_YEAR
strval = STR_JUST_INT
cat = SC_BASIC
[SDT_NULL]
length = 4
[SDTG_VAR]
name = ""old_ending_year_slv_105""
var = _old_ending_year_slv_105
flags = SLF_NOT_IN_CONFIG
type = SLE_INT32
to = SLV_105
def = DEF_END_YEAR
min = MIN_YEAR
max = MAX_YEAR
[SDT_VAR]
base = GameSettings
var = game_creation.ending_year
type = SLE_INT32
from = SLV_ENDING_YEAR
guiflags = SGF_0ISDISABLED
def = DEF_END_YEAR
min = MIN_YEAR
max = MAX_YEAR
interval = 1
str = STR_CONFIG_SETTING_ENDING_YEAR
strhelp = STR_CONFIG_SETTING_ENDING_YEAR_HELPTEXT
strval = STR_CONFIG_SETTING_ENDING_YEAR_VALUE
cat = SC_ADVANCED
[SDT_BOOL]
base = GameSettings
@@ -3505,9 +3530,9 @@ base = GameSettings
var = game_creation.custom_sea_level
type = SLE_UINT8
from = SLV_149
def = 1
min = 2
max = 90
def = CUSTOM_SEA_LEVEL_MIN_PERCENTAGE
min = CUSTOM_SEA_LEVEL_MIN_PERCENTAGE
max = CUSTOM_SEA_LEVEL_MAX_PERCENTAGE
cat = SC_BASIC
[SDT_VAR]