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/industry_cmd.cpp
#	src/landscape.cpp
#	src/object_cmd.cpp
#	src/rail_cmd.cpp
#	src/script/api/script_tile.cpp
#	src/table/settings/difficulty_settings.ini
#	src/table/settings/world_settings.ini
#	src/terraform_cmd.cpp
#	src/tilearea_type.h
#	src/tree_cmd.cpp
#	src/tree_cmd.h
#	src/tree_gui.cpp
#	src/water_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2023-01-14 16:40:24 +00:00
parent 6b9f387a68 07fba75238
commit 5b490b243d
16 changed files with 62 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/settings_type.h
View File

@@ -416,6 +416,7 @@ struct GameCreationSettings {
byte landscape; ///< the landscape we're currently in
byte water_borders; ///< bitset of the borders that are water
uint16 custom_town_number; ///< manually entered number of towns
uint16 custom_industry_number; ///< manually entered number of industries
byte variety; ///< variety level applied to TGP
byte custom_terrain_type; ///< manually entered height for TGP to aim for
byte custom_sea_level; ///< manually entered percentage of water in the map
@@ -431,7 +432,6 @@ struct GameCreationSettings {
uint8 amount_of_rocks; ///< the amount of rocks
uint8 height_affects_rocks; ///< the affect that map height has on rocks
uint8 build_public_roads; ///< build public roads connecting towns
uint16 custom_industry_number; ///< manually entered number of industries
};
/** Settings related to construction in-game */