Merge branch 'master' into jgrpp

2022-04-29 18:00:21 +01:00
parent 03bdb28c02 e79724ea22
commit c4e2175cc9
76 changed files with 628 additions and 583 deletions
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1437,6 +1437,12 @@ static void ValidateSettings()
 	}
 }

+static bool TownCouncilToleranceAdjust(int32 &new_value)
+{
+	if (new_value == 255) new_value = TOWN_COUNCIL_PERMISSIVE;
+	return true;
+}
+
 static void DifficultyNoiseChange(int32 new_value)
 {
 	if (_game_mode == GM_NORMAL) {