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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/lang/simplified_chinese.txt
#	src/network/core/tcp_content.cpp
#	src/network/core/udp.cpp
#	src/network/network_server.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/table/gameopt_settings.ini
This commit is contained in:
Jonathan G Rennison
2021-04-25 01:23:38 +01:00
parent 2e5b8d8110 fe3cd185d7
commit ba418f9d0d
96 changed files with 250 additions and 2653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/table/gameopt_settings.ini
View File

@@ -20,7 +20,6 @@ static const char *_autosave_interval = "off|monthly|quarterly|half year|yearly"
static const char *_roadsides = "left|right";
static const char *_savegame_date = "long|short|iso";
static const char *_savegame_overwrite_confirm = "no|different|not same|yes";
static const char *_server_langs = "ANY|ENGLISH|GERMAN|FRENCH|BRAZILIAN|BULGARIAN|CHINESE|CZECH|DANISH|DUTCH|ESPERANTO|FINNISH|HUNGARIAN|ICELANDIC|ITALIAN|JAPANESE|KOREAN|LITHUANIAN|NORWEGIAN|POLISH|PORTUGUESE|ROMANIAN|RUSSIAN|SLOVAK|SLOVENIAN|SPANISH|SWEDISH|TURKISH|UKRAINIAN|AFRIKAANS|CROATIAN|CATALAN|ESTONIAN|GALICIAN|GREEK|LATVIAN";
static const char *_osk_activation = "disabled|double|single|immediately";
static const char *_settings_profiles = "easy|medium|hard";
static const char *_news_display = "off|summarized|full";

10
src/table/settings.ini
View File

@@ -6235,16 +6235,6 @@ def = 0
min = 0
max = MAX_CLIENTS
[SDTC_OMANY]
var = network.server_lang
type = SLE_UINT8
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
guiflags = SGF_NETWORK_ONLY
def = 0
max = 35
full = _server_langs
cat = SC_BASIC
[SDTC_BOOL]
var = network.reload_cfg
flags = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC