amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-24 03:56:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: use EnumIndexArray for ClearGround-indexed arrays

Browse Source
This commit is contained in:
Peter Nelson
2026-05-20 21:27:49 +01:00
committed by Peter Nelson
parent 4d809f4b43
commit fa387fe129
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/clear_cmd.cpp
+6 -6
View File
@@ -26,7 +26,7 @@
/** @copydoc ClearTileProc */
static CommandCost ClearTile_Clear(TileIndex tile, DoCommandFlags flags)
{
static constexpr Price clear_price_table[to_underlying(ClearGround::MaxSize)] = {
static constexpr EnumIndexArray<Price, ClearGround, ClearGround::MaxSize> clear_price_table{
Price::ClearGrass, // Base price for clearing grass.
Price::ClearRough, // Base price for clearing rough land.
Price::ClearRocks, // Base price for clearing rocks.
@@ -41,11 +41,11 @@ static CommandCost ClearTile_Clear(TileIndex tile, DoCommandFlags flags)
ClearGround ground = GetClearGround(tile);
uint8_t density = GetClearDensity(tile);
if (IsSnowTile(tile)) {
price.AddCost(_price[clear_price_table[to_underlying(ground)]]);
price.AddCost(_price[clear_price_table[ground]]);
/* Add a little more for removing snow. */
price.AddCost(std::abs(_price[Price::ClearRough] - _price[Price::ClearGrass]));
} else if (ground != ClearGround::Grass || density != 0) {
price.AddCost(_price[clear_price_table[to_underlying(ground)]]);
price.AddCost(_price[clear_price_table[ground]]);
}
if (flags.Test(DoCommandFlag::Execute)) DoClearSquare(tile);
@@ -373,7 +373,7 @@ get_out:;
static void GetTileDesc_Clear(TileIndex tile, TileDesc &td)
{
/* Each pair holds a normal and a snowy ClearGround description. */
static constexpr std::pair<StringID, StringID> clear_land_str[to_underlying(ClearGround::MaxSize)] = {
static constexpr EnumIndexArray<std::pair<StringID, StringID>, ClearGround, ClearGround::MaxSize> clear_land_str{{{
{STR_LAI_CLEAR_DESCRIPTION_GRASS, STR_LAI_CLEAR_DESCRIPTION_SNOWY_GRASS}, // Description for grass.
{STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND, STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROUGH_LAND}, // Description for rough land.
{STR_LAI_CLEAR_DESCRIPTION_ROCKS, STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROCKS}, // Description for rocks.
@@ -382,12 +382,12 @@ static void GetTileDesc_Clear(TileIndex tile, TileDesc &td)
{STR_LAI_CLEAR_DESCRIPTION_DESERT, STR_EMPTY}, // Description for desert.
{STR_EMPTY, STR_EMPTY}, // unused entry does not appear in the map.
{STR_EMPTY, STR_EMPTY}, // unused entry does not appear in the map.
};
}}};
if (!IsSnowTile(tile) && IsClearGround(tile, ClearGround::Grass) && GetClearDensity(tile) == 0) {
td.str = STR_LAI_CLEAR_DESCRIPTION_BARE_LAND;
} else {
const auto &[name, snowy_name] = clear_land_str[to_underlying(GetClearGround(tile))];
const auto &[name, snowy_name] = clear_land_str[GetClearGround(tile)];
td.str = IsSnowTile(tile) ? snowy_name : name;
}
td.owner[0] = GetTileOwner(tile);