gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-09 23:50:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: Use std::array for cached town zone radius.

Browse Source
This commit is contained in:
Peter Nelson 2024-04-16 15:46:56 +01:00 committed by Peter Nelson
parent d57bf84196
commit fe7bd3a266
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/town.h
View File

@ -42,7 +42,7 @@ struct TownCache {
uint32_t population; ///< Current population of people uint32_t population; ///< Current population of people
TrackedViewportSign sign; ///< Location of name sign, UpdateVirtCoord updates this TrackedViewportSign sign; ///< Location of name sign, UpdateVirtCoord updates this
PartOfSubsidy part_of_subsidy; ///< Is this town a source/destination of a subsidy? PartOfSubsidy part_of_subsidy; ///< Is this town a source/destination of a subsidy?
uint32_t squared_town_zone_radius[HZB_END]; ///< UpdateTownRadius updates this given the house count std::array<uint32_t, HZB_END> squared_town_zone_radius; ///< UpdateTownRadius updates this given the house count
BuildingCounts<uint16_t> building_counts; ///< The number of each type of building in the town BuildingCounts<uint16_t> building_counts; ///< The number of each type of building in the town
}; };

8
src/town_cmd.cpp
View File

@ -1902,7 +1902,7 @@ static bool GrowTown(Town *t)
*/ */
void UpdateTownRadius(Town *t) void UpdateTownRadius(Town *t)
{ {
static const uint32_t _town_squared_town_zone_radius_data[23][HZB_END] = { static const std::array<std::array<uint32_t, HZB_END>, 23> _town_squared_town_zone_radius_data = {{
{ 4, 0, 0, 0, 0}, // 0 { 4, 0, 0, 0, 0}, // 0
{ 16, 0, 0, 0, 0}, { 16, 0, 0, 0, 0},
{ 25, 0, 0, 0, 0}, { 25, 0, 0, 0, 0},
@ -1926,10 +1926,10 @@ void UpdateTownRadius(Town *t)
{121, 81, 0, 49, 25}, // 80 {121, 81, 0, 49, 25}, // 80
{121, 81, 0, 49, 25}, {121, 81, 0, 49, 25},
{121, 81, 0, 49, 36}, // 88 {121, 81, 0, 49, 36}, // 88
}; }};
if (t->cache.num_houses < 92) { if (t->cache.num_houses < std::size(_town_squared_town_zone_radius_data) * 4) {
memcpy(t->cache.squared_town_zone_radius, _town_squared_town_zone_radius_data[t->cache.num_houses / 4], sizeof(t->cache.squared_town_zone_radius)); t->cache.squared_town_zone_radius = _town_squared_town_zone_radius_data[t->cache.num_houses / 4];
} else { } else {
int mass = t->cache.num_houses / 8; int mass = t->cache.num_houses / 8;
/* Actually we are proportional to sqrt() but that's right because we are covering an area. /* Actually we are proportional to sqrt() but that's right because we are covering an area.