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

Avoid integer overflow issues in measurement tooltip

Browse Source 
For large distances
Use integer instead of floating point sqrt
This commit is contained in:
Jonathan G Rennison
2023-03-09 17:39:34 +00:00
parent 3017cb63a9
commit fd532fbd6f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/viewport.cpp
View File

@@ -6007,8 +6007,7 @@ calc_heightdiff_single_direction:;
if (dx != 1 || dy != 1) { if (dx != 1 || dy != 1) {
heightdiff = CalcHeightdiff(style, 0, t0, t1); heightdiff = CalcHeightdiff(style, 0, t0, t1);
params[index++] = DistanceManhattan(t0, t1); params[index++] = DistanceManhattan(t0, t1);
params[index++] = sqrtl(dx * dx + dy * dy); //DistanceSquare does not like big numbers params[index++] = IntSqrt64(((uint64)dx * (uint64)dx) + ((uint64)dy * (uint64)dy)); // Avoid overflow in DistanceSquare
} else { } else {
index += 2; index += 2;
} }
@@ -6016,7 +6015,7 @@ calc_heightdiff_single_direction:;
params[index++] = DistanceFromEdge(t1); params[index++] = DistanceFromEdge(t1);
params[index++] = GetTileMaxZ(t1) * TILE_HEIGHT_STEP; params[index++] = GetTileMaxZ(t1) * TILE_HEIGHT_STEP;
params[index++] = heightdiff; params[index++] = heightdiff;
//Show always the measurement tooltip /* Always show the measurement tooltip */
GuiShowTooltips(_thd.GetCallbackWnd(), STR_MEASURE_DIST_HEIGHTDIFF, index, params, TCC_EXIT_VIEWPORT); GuiShowTooltips(_thd.GetCallbackWnd(), STR_MEASURE_DIST_HEIGHTDIFF, index, params, TCC_EXIT_VIEWPORT);
break; break;
} }