Use new SGBucket API in tile-manager

[flightgear.git] / src / Cockpit / NavDisplay.hxx

diff --git a/src/Cockpit/NavDisplay.hxx b/src/Cockpit/NavDisplay.hxx
index b45caed6c645c435fe96816c08b0e9ed4577f4d8..8a24eece7ba7bf3f24dc145d51e413a3511abcc6 100644 (file)
--- a/src/Cockpit/NavDisplay.hxx
+++ b/src/Cockpit/NavDisplay.hxx
@@ -121,6 +121,9 @@ private:
     void processAI();
     void computeAIStates(const SGPropertyNode* ai, string_set& states);
     
+    void computeCustomSymbolStates(const SGPropertyNode* sym, string_set& states);
+    void processCustomSymbols();
+    
     void findRules(const std::string& type, const string_set& states, SymbolRuleVector& rules);
     
     SymbolInstance* addSymbolInstance(const osg::Vec2& proj, double heading, SymbolDef* def, SGPropertyNode* vars);
@@ -189,10 +192,11 @@ private:
     
     bool _cachedItemsValid;
     SGVec3d _cachedPos;
-    FGPositioned::List _itemsInRange;
+    FGPositionedList _itemsInRange;
     SGPropertyNode_ptr _excessDataNode;
     int _maxSymbols;
-  
+    SGPropertyNode_ptr _customSymbols;
+    
     class CacheListener;
     std::auto_ptr<CacheListener> _cacheListener;