mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-08-16 19:19:09 +00:00
(svn r11246) -Codechange: beautify some conditions from "if else" into trinary operator
This commit is contained in:
@@ -511,10 +511,8 @@ static void GetTileDesc_Trees(TileIndex tile, TileDesc *td)
|
|||||||
|
|
||||||
if (IS_INT_INSIDE(tt, TREE_RAINFOREST, TREE_CACTUS)) {
|
if (IS_INT_INSIDE(tt, TREE_RAINFOREST, TREE_CACTUS)) {
|
||||||
td->str = STR_280F_RAINFOREST;
|
td->str = STR_280F_RAINFOREST;
|
||||||
} else if (tt == TREE_CACTUS) {
|
|
||||||
td->str = STR_2810_CACTUS_PLANTS;
|
|
||||||
} else {
|
} else {
|
||||||
td->str = STR_280E_TREES;
|
td->str = tt == TREE_CACTUS ? STR_2810_CACTUS_PLANTS : STR_280E_TREES;
|
||||||
}
|
}
|
||||||
|
|
||||||
td->owner = GetTileOwner(tile);
|
td->owner = GetTileOwner(tile);
|
||||||
@@ -661,8 +659,7 @@ static void TileLoop_Trees(TileIndex tile)
|
|||||||
case TREE_GROUND_GRASS: MakeClear(tile, CLEAR_GRASS, GetTreeDensity(tile)); break;
|
case TREE_GROUND_GRASS: MakeClear(tile, CLEAR_GRASS, GetTreeDensity(tile)); break;
|
||||||
case TREE_GROUND_ROUGH: MakeClear(tile, CLEAR_ROUGH, 3); break;
|
case TREE_GROUND_ROUGH: MakeClear(tile, CLEAR_ROUGH, 3); break;
|
||||||
default: // snow or desert
|
default: // snow or desert
|
||||||
if (_opt.landscape == LT_TROPIC) MakeClear(tile, CLEAR_DESERT, GetTreeDensity(tile));
|
MakeClear(tile, _opt.landscape == LT_TROPIC ? CLEAR_DESERT : CLEAR_SNOW, GetTreeDensity(tile));
|
||||||
else MakeClear(tile, CLEAR_SNOW, GetTreeDensity(tile));
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user