dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VarAction2: Use masking for sub-parts of industry var 67

Browse Source 
Ensure that distance and count can't overflow on very large maps
This commit is contained in:
Jonathan G Rennison
2022-07-31 23:03:24 +01:00
parent 0a99440166
commit 0e1e892ca8
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/newgrf_industries.cpp
View File

@@ -110,12 +110,12 @@ static uint32 GetClosestIndustry(TileIndex tile, IndustryType type, const Indust
* @param current Industry for which the inquiry is made * @param current Industry for which the inquiry is made
* @return the formatted answer to the callback : rr(reserved) cc(count) dddd(manhattan distance of closest sister) * @return the formatted answer to the callback : rr(reserved) cc(count) dddd(manhattan distance of closest sister)
*/ */
static uint32 GetCountAndDistanceOfClosestInstance(byte param_setID, byte layout_filter, bool town_filter, const Industry *current) static uint32 GetCountAndDistanceOfClosestInstance(byte param_setID, byte layout_filter, bool town_filter, const Industry *current, uint32 mask)
{ {
uint32 GrfID = GetRegister(0x100); ///< Get the GRFID of the definition to look for in register 100h uint32 GrfID = GetRegister(0x100); ///< Get the GRFID of the definition to look for in register 100h
IndustryType ind_index; IndustryType ind_index;
uint32 closest_dist = UINT32_MAX; uint32 closest_dist = UINT32_MAX;
byte count = 0; uint count = 0;
/* Determine what will be the industry type to look for */ /* Determine what will be the industry type to look for */
switch (GrfID) { switch (GrfID) {
@@ -139,8 +139,8 @@ static uint32 GetCountAndDistanceOfClosestInstance(byte param_setID, byte layout
if (layout_filter == 0 && !town_filter) { if (layout_filter == 0 && !town_filter) {
/* If the filter is 0, it could be because none was specified as well as being really a 0. /* If the filter is 0, it could be because none was specified as well as being really a 0.
* In either case, just do the regular var67 */ * In either case, just do the regular var67 */
closest_dist = GetClosestIndustry(current->location.tile, ind_index, current); if (mask & 0xFFFF) closest_dist = GetClosestIndustry(current->location.tile, ind_index, current);
count = std::min<uint>(Industry::GetIndustryTypeCount(ind_index), UINT8_MAX); // clamp to 8 bit if (mask & 0xFF0000) count = std::min<uint>(Industry::GetIndustryTypeCount(ind_index), UINT8_MAX); // clamp to 8 bit
} else { } else {
/* Count only those who match the same industry type and layout filter /* Count only those who match the same industry type and layout filter
* Unfortunately, we have to do it manually */ * Unfortunately, we have to do it manually */
@@ -150,9 +150,10 @@ static uint32 GetCountAndDistanceOfClosestInstance(byte param_setID, byte layout
count++; count++;
} }
} }
count = std::min<uint>(count, UINT8_MAX);
} }
return count << 16 | GB(closest_dist, 0, 16); return count << 16 | std::min<uint>(closest_dist, 0xFFFF);
} }
/* virtual */ uint32 IndustriesScopeResolver::GetVariable(uint16 variable, uint32 parameter, GetVariableExtra *extra) const /* virtual */ uint32 IndustriesScopeResolver::GetVariable(uint16 variable, uint32 parameter, GetVariableExtra *extra) const
@@ -304,7 +305,7 @@ static uint32 GetCountAndDistanceOfClosestInstance(byte param_setID, byte layout
layout_filter = GB(reg, 0, 8); layout_filter = GB(reg, 0, 8);
town_filter = HasBit(reg, 8); town_filter = HasBit(reg, 8);
} }
return GetCountAndDistanceOfClosestInstance(parameter, layout_filter, town_filter, this->industry); return GetCountAndDistanceOfClosestInstance(parameter, layout_filter, town_filter, this->industry, extra->mask);
} }
case 0x69: case 0x69: