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

2
src/station_cmd.cpp
View File

@@ -2548,7 +2548,7 @@ uint8 GetAirportNoiseLevelForDistance(const AirportSpec *as, uint distance)
* So no need to go any further*/
if (as->noise_level < 2) return as->noise_level;
if (_settings_game.difficulty.town_council_tolerance == TOWN_COUNCIL_INDIFFERENT) return 1;
if (_settings_game.difficulty.town_council_tolerance == TOWN_COUNCIL_PERMISSIVE) return 1;
/* The steps for measuring noise reduction are based on the "magical" (and arbitrary) 8 base distance
* adding the town_council_tolerance 4 times, as a way to graduate, depending of the tolerance.