X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2FNavDisplay.cxx;h=30be600fdf838d5aee7fc2591b3acd224d730b2f;hb=0b9adf8854398461333eba43df18fa2f5c8231a1;hp=5664828f952cfaaafeea6caaab6754eb7d55d91a;hpb=9fa790bcac7e535bb06cd228ae15178f1b10b26f;p=flightgear.git diff --git a/src/Instrumentation/NavDisplay.cxx b/src/Instrumentation/NavDisplay.cxx index 5664828f9..30be600fd 100644 --- a/src/Instrumentation/NavDisplay.cxx +++ b/src/Instrumentation/NavDisplay.cxx @@ -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 }