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

Codechange: Replace TILE_AREA_LOOP with range-based for loops

Browse Source
This commit is contained in:
glx22
2021-05-12 16:45:28 +02:00
committed by Loïc Guilloux
parent 5bd8144853
commit 38c97e1492
23 changed files with 101 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/terraform_gui.cpp
View File

@@ -57,7 +57,7 @@ static void GenerateDesertArea(TileIndex end, TileIndex start)
_generating_world = true;
TileArea ta(start, end);
TILE_AREA_LOOP(tile, ta) {
for (TileIndex tile : ta) {
SetTropicZone(tile, (_ctrl_pressed) ? TROPICZONE_NORMAL : TROPICZONE_DESERT);
DoCommandP(tile, 0, 0, CMD_LANDSCAPE_CLEAR);
MarkTileDirtyByTile(tile);
@@ -74,7 +74,7 @@ static void GenerateRockyArea(TileIndex end, TileIndex start)
bool success = false;
TileArea ta(start, end);
TILE_AREA_LOOP(tile, ta) {
for (TileIndex tile : ta) {
switch (GetTileType(tile)) {
case MP_TREES:
if (GetTreeGround(tile) == TREE_GROUND_SHORE) continue;
@@ -408,18 +408,18 @@ static void CommonRaiseLowerBigLand(TileIndex tile, int mode)
if (mode != 0) {
/* Raise land */
h = MAX_TILE_HEIGHT;
TILE_AREA_LOOP(tile2, ta) {
for (TileIndex tile2 : ta) {
h = std::min(h, TileHeight(tile2));
}
} else {
/* Lower land */
h = 0;
TILE_AREA_LOOP(tile2, ta) {
for (TileIndex tile2 : ta) {
h = std::max(h, TileHeight(tile2));
}
}
TILE_AREA_LOOP(tile2, ta) {
for (TileIndex tile2 : ta) {
if (TileHeight(tile2) == h) {
DoCommandP(tile2, SLOPE_N, (uint32)mode, CMD_TERRAFORM_LAND);
}