fly/flightgear
1
0
Fork 0
Code Activity

Fix a bad copy-and-paste bug in namedFindClosest, which broke things in the

Browse source 
multiple-matches case.
This commit is contained in:
jmt 2009-06-11 09:47:26 +00:00 • committed by Tim Moore
parent e837aefceb
commit 83c29b4f43
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Navaids/positioned.cxx
View file

@ -266,22 +266,22 @@ namedFindClosest(const std::string& aIdent, const SGGeod& aOrigin, FGPositioned:
SGVec3d cartOrigin(SGVec3d::fromGeod(aOrigin)); SGVec3d cartOrigin(SGVec3d::fromGeod(aOrigin));
for (; it != range.second; ++it) { for (; it != range.second; ++it) {
FGPositioned::Type ty = range.first->second->type(); FGPositioned* r = it->second;
if (aFilter) { if (aFilter) {
if (aFilter->hasTypeRange() && !aFilter->passType(ty)) { if (aFilter->hasTypeRange() && !aFilter->passType(r->type())) {
continue; continue;
} }
if (!aFilter->pass(range.first->second)) { if (!aFilter->pass(r)) {
continue; continue;
} }
} }
// find distance // find distance
double d2 = distSqr(cartOrigin, it->second->cart()); double d2 = distSqr(cartOrigin, r->cart());
if (d2 < minDist) { if (d2 < minDist) {
minDist = d2; minDist = d2;
result = it->second; result = r;
} }
} }