mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Change: Show the type of land covered by snow.

pull/13660/head
Peter Nelson 2025-02-20 19:21:39 +00:00 committed by Peter Nelson
parent 3cf9b15959
commit f1b683b372
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/clear_cmd.cpp
View File

@ -335,21 +335,23 @@ static TrackStatus GetTileTrackStatus_Clear(TileIndex, TransportType, uint, Diag
return 0; return 0;
} }
static const StringID _clear_land_str[] = {
STR_LAI_CLEAR_DESCRIPTION_GRASS,
STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND,
STR_LAI_CLEAR_DESCRIPTION_ROCKS,
STR_LAI_CLEAR_DESCRIPTION_FIELDS,
STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND,
STR_LAI_CLEAR_DESCRIPTION_DESERT
};
static void GetTileDesc_Clear(TileIndex tile, TileDesc &td) static void GetTileDesc_Clear(TileIndex tile, TileDesc &td)
{ {
if (IsClearGround(tile, CLEAR_GRASS) && GetClearDensity(tile) == 0) { /* Each pair holds a normal and a snowy ClearGround description. */
static constexpr std::pair<StringID, StringID> clear_land_str[] = {
{STR_LAI_CLEAR_DESCRIPTION_GRASS, STR_LAI_CLEAR_DESCRIPTION_SNOWY_GRASS},
{STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND, STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROUGH_LAND},
{STR_LAI_CLEAR_DESCRIPTION_ROCKS, STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROCKS},
{STR_LAI_CLEAR_DESCRIPTION_FIELDS, STR_EMPTY},
{STR_EMPTY, STR_EMPTY}, // CLEAR_SNOW does not appear in the map.
{STR_LAI_CLEAR_DESCRIPTION_DESERT, STR_EMPTY},
};
if (!IsSnowTile(tile) && IsClearGround(tile, CLEAR_GRASS) && GetClearDensity(tile) == 0) {
td.str = STR_LAI_CLEAR_DESCRIPTION_BARE_LAND; td.str = STR_LAI_CLEAR_DESCRIPTION_BARE_LAND;
} else { } else {
td.str = _clear_land_str[GetClearGround(tile)]; const auto &[name, snowy_name] = clear_land_str[GetClearGround(tile)];
td.str = IsSnowTile(tile) ? snowy_name : name;
} }
td.owner[0] = GetTileOwner(tile); td.owner[0] = GetTileOwner(tile);
} }

4
src/lang/english.txt
View File

@ -3157,8 +3157,10 @@ STR_LAI_CLEAR_DESCRIPTION_ROUGH_LAND :Rough land
STR_LAI_CLEAR_DESCRIPTION_BARE_LAND :Bare land STR_LAI_CLEAR_DESCRIPTION_BARE_LAND :Bare land
STR_LAI_CLEAR_DESCRIPTION_GRASS :Grass STR_LAI_CLEAR_DESCRIPTION_GRASS :Grass
STR_LAI_CLEAR_DESCRIPTION_FIELDS :Fields STR_LAI_CLEAR_DESCRIPTION_FIELDS :Fields
STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND :Snow-covered land
STR_LAI_CLEAR_DESCRIPTION_DESERT :Desert STR_LAI_CLEAR_DESCRIPTION_DESERT :Desert
STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROCKS :Snow-covered rocks
STR_LAI_CLEAR_DESCRIPTION_SNOWY_ROUGH_LAND :Snow-covered rough land
STR_LAI_CLEAR_DESCRIPTION_SNOWY_GRASS :Snow-covered grass
STR_LAI_RAIL_DESCRIPTION_TRACK :Railway track STR_LAI_RAIL_DESCRIPTION_TRACK :Railway track
STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS :Railway track with block signals STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS :Railway track with block signals