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

Merge branch 'master' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-04-29 18:00:21 +01:00
parent 03bdb28c02 e79724ea22
commit c4e2175cc9
76 changed files with 628 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/table/settings/settings.ini
View File

@@ -23,6 +23,7 @@ static void RoadVehSlopeSteepnessChanged(int32 new_value);
static void ProgrammableSignalsShownChanged(int32 new_value);
static void VehListCargoFilterShownChanged(int32 new_value);
static void TownFoundingChanged(int32 new_value);
static bool TownCouncilToleranceAdjust(int32 &new_value);
static void DifficultyNoiseChange(int32 new_value);
static void DifficultyMoneyCheatMultiplayerChange(int32 new_value);
static void DifficultyRenameTownsMultiplayerChange(int32 new_value);
@@ -111,10 +112,10 @@ static const SettingDescEnumEntry _linkgraph_mode_per_cargo[] = {
{ 0, STR_NULL }
};
static const SettingDescEnumEntry _town_council_approval[] = {
{ 255, STR_CITY_APPROVAL_INDIFFERENT },
{ 0, STR_CITY_APPROVAL_PERMISSIVE },
{ 0, STR_CITY_APPROVAL_LENIENT },
{ 1, STR_CITY_APPROVAL_TOLERANT },
{ 2, STR_CITY_APPROVAL_HOSTILE },
{ 3, STR_CITY_APPROVAL_PERMISSIVE },
{ 0, STR_NULL }
};
@@ -439,6 +440,7 @@ def = 0
enumlist = _town_council_approval
str = STR_CONFIG_SETTING_CITY_APPROVAL
strhelp = STR_CONFIG_SETTING_CITY_APPROVAL_HELPTEXT
pre_cb = TownCouncilToleranceAdjust
post_cb = DifficultyNoiseChange
[SDT_BOOL]