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

Merge branch 'jgrpp' into jgrpp-beta

Browse Source 
# Conflicts:
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
This commit is contained in:
Jonathan G Rennison
2021-10-29 22:22:54 +01:00
parent 24c6dfe872 e34cc229d1
commit 61cc60099a
45 changed files with 382 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/settings_type.h
View File

@@ -641,6 +641,8 @@ struct EconomySettings {
bool allow_town_roads; ///< towns are allowed to build roads (always allowed when generating world / in SE)
uint16 town_min_distance; ///< minimum distance between towns
uint8 max_town_heightlevel; ///< maximum height level for towns
uint16 min_town_land_area; ///< minimum contiguous lang area for towns.
uint16 min_city_land_area; ///< minimum contiguous lang area for cities.
TownFounding found_town; ///< town founding.
bool station_noise_level; ///< build new airports when the town noise level is still within accepted limits
uint16 town_noise_population[3]; ///< population to base decision on noise evaluation (@see town_council_tolerance)