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

Reduce duplication in desert or rainforeset data search arrays

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-03-06 02:05:12 +00:00
parent 3bf2e850a5
commit 39d39a5c61
2 changed files with 90 additions and 3002 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/landscape.cpp
View File

@@ -1001,7 +1001,7 @@ static void GenerateTerrain(int type, uint flag)
#include "table/genland.h" #include "table/genland.h"
static std::pair<const TileIndexDiffC *, const TileIndexDiffC *> GetDesertOrRainforestData() static std::pair<const Rect16 *, const Rect16 *> GetDesertOrRainforestData()
{ {
switch (_settings_game.game_creation.coast_tropics_width) { switch (_settings_game.game_creation.coast_tropics_width) {
case 0: case 0:
@@ -1017,22 +1017,35 @@ static std::pair<const TileIndexDiffC *, const TileIndexDiffC *> GetDesertOrRain
} }
} }
template <typename F>
void DesertOrRainforestProcessTiles(const std::pair<const Rect16 *, const Rect16 *> desert_rainforest_data, const Rect16 *&data, TileIndex tile, F handle_tile)
{
for (data = desert_rainforest_data.first; data != desert_rainforest_data.second; ++data) {
const Rect16 r = *data;
for (int16 x = r.left; x <= r.right; x++) {
for (int16 y = r.top; y <= r.bottom; y++) {
TileIndex t = AddTileIndexDiffCWrap(tile, { x, y });
if (handle_tile(t)) return;
}
}
}
}
static void CreateDesertOrRainForest(uint desert_tropic_line) static void CreateDesertOrRainForest(uint desert_tropic_line)
{ {
TileIndex update_freq = MapSize() / 4; TileIndex update_freq = MapSize() / 4;
const TileIndexDiffC *data; const Rect16 *data;
const std::pair<const TileIndexDiffC *, const TileIndexDiffC *> desert_rainforest_data = GetDesertOrRainforestData(); const std::pair<const Rect16 *, const Rect16 *> desert_rainforest_data = GetDesertOrRainforestData();
for (TileIndex tile = 0; tile != MapSize(); ++tile) { for (TileIndex tile = 0; tile != MapSize(); ++tile) {
if ((tile % update_freq) == 0) IncreaseGeneratingWorldProgress(GWP_LANDSCAPE); if ((tile % update_freq) == 0) IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
if (!IsValidTile(tile)) continue; if (!IsValidTile(tile)) continue;
for (data = desert_rainforest_data.first; data != desert_rainforest_data.second; ++data) { DesertOrRainforestProcessTiles(desert_rainforest_data, data, tile, [&](TileIndex t) -> bool {
TileIndex t = AddTileIndexDiffCWrap(tile, *data); return (t != INVALID_TILE && (TileHeight(t) >= desert_tropic_line || IsTileType(t, MP_WATER)));
if (t != INVALID_TILE && (TileHeight(t) >= desert_tropic_line || IsTileType(t, MP_WATER))) break; });
}
if (data == desert_rainforest_data.second) { if (data == desert_rainforest_data.second) {
SetTropicZone(tile, TROPICZONE_DESERT); SetTropicZone(tile, TROPICZONE_DESERT);
} }
@@ -1049,10 +1062,9 @@ static void CreateDesertOrRainForest(uint desert_tropic_line)
if (!IsValidTile(tile)) continue; if (!IsValidTile(tile)) continue;
for (data = desert_rainforest_data.first; data != desert_rainforest_data.second; ++data) { DesertOrRainforestProcessTiles(desert_rainforest_data, data, tile, [&](TileIndex t) -> bool {
TileIndex t = AddTileIndexDiffCWrap(tile, *data); return (t != INVALID_TILE && IsTileType(t, MP_CLEAR) && IsClearGround(t, CLEAR_DESERT));
if (t != INVALID_TILE && IsTileType(t, MP_CLEAR) && IsClearGround(t, CLEAR_DESERT)) break; });
}
if (data == desert_rainforest_data.second) { if (data == desert_rainforest_data.second) {
SetTropicZone(tile, TROPICZONE_RAINFOREST); SetTropicZone(tile, TROPICZONE_RAINFOREST);
} }

3058
src/table/genland.h
View File

File diff suppressed because it is too large Load Diff