fly/flightgear
1
0
Fork 0
Code Activity

Fix another case-sensitivity issue in the NavDisplay.

Browse source
This commit is contained in:
James Turner 2012-06-10 11:11:42 +01:00
parent a237fa6a4c
commit 5fc98e4ed0
2 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Instrumentation/NavDisplay.cxx
View file

@ -1114,21 +1114,6 @@ bool NavDisplay::anyRuleForType(const string& type) const
return false;
}
bool NavDisplay::anyRuleMatches(const string& type, const string_set& states) const
{
BOOST_FOREACH(SymbolRule* r, _rules) {
if (!r->enabled || (r->type != type)) {
continue;
}
if (r->matches(states)) {
return true;
}
} // of rules iteration
return false;
}
void NavDisplay::findRules(const string& type, const string_set& states, SymbolRuleVector& rules)
{
BOOST_FOREACH(SymbolRule* candidate, _rules) {
@ -1152,6 +1137,7 @@ bool NavDisplay::isPositionedShown(FGPositioned* pos)
void NavDisplay::isPositionedShownInner(FGPositioned* pos, SymbolRuleVector& rules)
{
string type = FGPositioned::nameForType(pos->type());
boost::to_lower(type);
if (!anyRuleForType(type)) {
return; // not diplayed at all, we're done
}

2
src/Instrumentation/NavDisplay.hxx
View file

@ -120,8 +120,6 @@ private:
void processAI();
void computeAIStates(const SGPropertyNode* ai, string_set& states);
bool anyRuleMatches(const std::string& type, const string_set& states) const;
void findRules(const std::string& type, const string_set& states, SymbolRuleVector& rules);
SymbolInstance* addSymbolInstance(const osg::Vec2& proj, double heading, SymbolDef* def, SGPropertyNode* vars);