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

(svn r27328) -Codechange: Add an assertion to check for uninitialised variables when tracing variety distribution's control curves.

release/1.6
frosch 2015-07-11 10:41:20 +00:00
parent 662408f71a
commit 8437726cca
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tgp.cpp
View File

@ -667,6 +667,7 @@ static void HeightMapCurves(uint level)
for (uint t = 0; t < lengthof(curve_maps); t++) { for (uint t = 0; t < lengthof(curve_maps); t++) {
if (!HasBit(corner_bits, t)) continue; if (!HasBit(corner_bits, t)) continue;
bool found = false;
const control_point_t *cm = curve_maps[t].list; const control_point_t *cm = curve_maps[t].list;
for (uint i = 0; i < curve_maps[t].length - 1; i++) { for (uint i = 0; i < curve_maps[t].length - 1; i++) {
const control_point_t &p1 = cm[i]; const control_point_t &p1 = cm[i];
@ -674,9 +675,11 @@ static void HeightMapCurves(uint level)
if (*h >= p1.x && *h < p2.x) { if (*h >= p1.x && *h < p2.x) {
ht[t] = p1.y + (*h - p1.x) * (p2.y - p1.y) / (p2.x - p1.x); ht[t] = p1.y + (*h - p1.x) * (p2.y - p1.y) / (p2.x - p1.x);
found = true;
break; break;
} }
} }
assert(found);
} }
/* Apply interpolation of curve map results. */ /* Apply interpolation of curve map results. */