diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index 2d9a6d2de5..6e23f63c59 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -1356,7 +1356,7 @@ static uint GetRoadSpriteOffset(Slope slope, RoadBits bits) * @param roadside What sort of road this is * @return True if snow/desert road sprites should be used. */ -static bool DrawRoadAsSnowDesert(bool snow_or_desert, Roadside roadside) +static bool DrawRoadAsSnowOrDesert(bool snow_or_desert, Roadside roadside) { return (snow_or_desert && !(_settings_game.game_creation.landscape == LandscapeType::Tropic && HasGrfMiscBit(GrfMiscBit::DesertPavedRoads) && @@ -1556,7 +1556,7 @@ static SpriteID GetRoadGroundSprite(const TileInfo *ti, Roadside roadside, const { /* Draw bare ground sprite if no road or road uses overlay system. */ if (rti == nullptr || rti->UsesOverlay()) { - if (DrawRoadAsSnowDesert(snow_or_desert, roadside)) { + if (DrawRoadAsSnowOrDesert(snow_or_desert, roadside)) { return SPR_FLAT_SNOW_DESERT_TILE + SlopeToSpriteOffset(ti->tileh); } @@ -1571,7 +1571,7 @@ static SpriteID GetRoadGroundSprite(const TileInfo *ti, Roadside roadside, const /* Draw original road base sprite */ SpriteID image = SPR_ROAD_Y + offset; - if (DrawRoadAsSnowDesert(snow_or_desert, roadside)) { + if (DrawRoadAsSnowOrDesert(snow_or_desert, roadside)) { image += 19; } else { switch (roadside) { @@ -1720,7 +1720,7 @@ static void DrawTile_Road(TileInfo *ti) SpriteID image = SPR_ROAD_Y + axis; Roadside roadside = GetRoadside(ti->tile); - if (DrawRoadAsSnowDesert(IsOnSnow(ti->tile), roadside)) { + if (DrawRoadAsSnowOrDesert(IsOnSnow(ti->tile), roadside)) { image += 19; } else { switch (roadside) { @@ -1736,7 +1736,7 @@ static void DrawTile_Road(TileInfo *ti) if (IsCrossingBarred(ti->tile)) image += 2; Roadside roadside = GetRoadside(ti->tile); - if (DrawRoadAsSnowDesert(IsOnSnow(ti->tile), roadside)) { + if (DrawRoadAsSnowOrDesert(IsOnSnow(ti->tile), roadside)) { image += 8; } else { switch (roadside) {