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

Mapgen: Allow starting a rocky patch on a desert tile when enabled

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-12-14 23:07:34 +00:00
parent 0a9d734ce8
commit d69bb5f511
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/clear_cmd.cpp
View File

@@ -414,7 +414,10 @@ void GenerateClearTile()
tile = RandomTileSeed(r); tile = RandomTileSeed(r);
IncreaseGeneratingWorldProgress(GWP_ROUGH_ROCKY); IncreaseGeneratingWorldProgress(GWP_ROUGH_ROCKY);
if (IsTileType(tile, MP_CLEAR) && !IsClearGround(tile, CLEAR_DESERT)) { auto IsUsableTile = [&](TileIndex t) -> bool {
return IsTileType(t, MP_CLEAR) && (_allow_rocks_desert || !IsClearGround(t, CLEAR_DESERT));
};
if (IsUsableTile(tile)) {
uint j = GB(r, 16, 4) + _settings_game.game_creation.amount_of_rocks + ((int)TileHeight(tile) * _settings_game.game_creation.height_affects_rocks); uint j = GB(r, 16, 4) + _settings_game.game_creation.amount_of_rocks + ((int)TileHeight(tile) * _settings_game.game_creation.height_affects_rocks);
for (;;) { for (;;) {
TileIndex tile_new; TileIndex tile_new;
@@ -424,7 +427,7 @@ void GenerateClearTile()
do { do {
if (--j == 0) goto get_out; if (--j == 0) goto get_out;
tile_new = tile + TileOffsByDiagDir((DiagDirection)GB(Random(), 0, 2)); tile_new = tile + TileOffsByDiagDir((DiagDirection)GB(Random(), 0, 2));
} while (!IsTileType(tile_new, MP_CLEAR) || (!_allow_rocks_desert && IsClearGround(tile_new, CLEAR_DESERT))); } while (!IsUsableTile(tile_new));
tile = tile_new; tile = tile_new;
} }
get_out:; get_out:;