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

Merge PR #336 into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-11-19 23:20:05 +00:00
parent af2c51e3d4 5a53b4d846
commit 5959e1c0f9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/landscape.cpp
View File

@@ -1055,7 +1055,7 @@ static bool FindSpring(TileIndex tile, void *user_data)
if (!IsTileFlat(tile, &referenceHeight) || IsWaterTile(tile)) return false;
/* In the tropics rivers start in the rainforest. */
if (_settings_game.game_creation.landscape == LT_TROPIC && GetTropicZone(tile) != TROPICZONE_RAINFOREST) return false;
if (_settings_game.game_creation.landscape == LT_TROPIC && GetTropicZone(tile) != TROPICZONE_RAINFOREST && !_settings_game.game_creation.lakes_allowed_in_deserts) return false;
/* Are there enough higher tiles to warrant a 'spring'? */
uint num = 0;
@@ -1100,7 +1100,7 @@ static bool MakeLake(TileIndex tile, void *user_data)
{
const MakeLakeData *data = (const MakeLakeData *)user_data;
if (!IsValidTile(tile) || TileHeight(tile) != data->height || !IsTileFlat(tile)) return false;
if (_settings_game.game_creation.landscape == LT_TROPIC && GetTropicZone(tile) == TROPICZONE_DESERT) return false;
if (_settings_game.game_creation.landscape == LT_TROPIC && GetTropicZone(tile) == TROPICZONE_DESERT && !_settings_game.game_creation.lakes_allowed_in_deserts) return false;
/* Offset from centre tile */
const int64 x_delta = (int)TileX(tile) - (int)TileX(data->centre);

4
src/lang/english.txt
View File

@@ -1647,8 +1647,8 @@ STR_CONFIG_SETTING_LAKE_SIZE :Size of lakes:
STR_CONFIG_SETTING_LAKE_SIZE_HELPTEXT :Controls the size of lakes that are generated along rivers.
STR_CONFIG_SETTING_LAKE_SIZE_VALUE :{NUM}
STR_CONFIG_SETTING_LAKE_SIZE_ZERO :No lakes
STR_CONFIG_SETTING_LAKES_ALLOWED_IN_DESERTS :Lakes can be generated in sub-tropic climate deserts: {STRING}
STR_CONFIG_SETTING_LAKES_ALLOWED_IN_DESERTS_HELPTEXT :Choose whether the lakes that spawn along rivers are allowed in deserts.
STR_CONFIG_SETTING_LAKES_ALLOWED_IN_DESERTS :Lakes and rivers can be generated in sub-tropic climate deserts: {STRING}
STR_CONFIG_SETTING_LAKES_ALLOWED_IN_DESERTS_HELPTEXT :Choose whether lakes and rivers are allowed to spawn in sub-tropic climate deserts.
STR_CONFIG_SETTING_RIVER_AMOUNT :River amount: {STRING2}
STR_CONFIG_SETTING_RIVER_AMOUNT_HELPTEXT :Choose how many rivers to generate
STR_CONFIG_SETTING_ROCKS_AMOUNT :Size of rocky patches: {STRING}