Modified Files:

[flightgear.git] / src / ATC / AIMgr.hxx

diff --git a/src/ATC/AIMgr.hxx b/src/ATC/AIMgr.hxx
index f34cdc1512cfcef8f096592a3e250bdeacc17552..6bc81a10b9afd33da00cf5366e2415469d24d2d9 100644 (file)
--- a/src/ATC/AIMgr.hxx
+++ b/src/ATC/AIMgr.hxx
@@ -17,7 +17,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #ifndef _FG_AIMGR_HXX
 #define _FG_AIMGR_HXX
@@ -86,9 +86,9 @@ private:
     double lat;
     double elev;
     // Pointers to current users position
-    SGPropertyNode *lon_node;
-    SGPropertyNode *lat_node;
-    SGPropertyNode *elev_node;
+    SGPropertyNode_ptr lon_node;
+    SGPropertyNode_ptr lat_node;
+    SGPropertyNode_ptr elev_node;
 
 public:
 
@@ -105,12 +105,12 @@ public:
        
        // Signal that it is OK to remove a plane of callsign s
        // (To be called by the plane itself).
-       void ScheduleRemoval(string s);
+       void ScheduleRemoval(const string& s);
 
 private:
        
-       ssgBranch* _defaultModel;  // Cessna 172!
-       ssgBranch* _piperModel;    // pa28-161
+        osg::ref_ptr<osg::Node> _defaultModel;  // Cessna 172!
+       osg::ref_ptr<osg::Node> _piperModel;    // pa28-161
 
        bool initDone;  // Hack - guard against update getting called before init
 
@@ -118,10 +118,10 @@ private:
     //void RemoveFromList(const char* id, atc_type tp);
        
        // Activate AI traffic at an airport
-       void ActivateAirport(string ident);
+       void ActivateAirport(const string& ident);
        
        // Hack - Generate AI traffic at an airport with no facilities file, with the first plane being at least min_dist out.
-       void GenerateSimpleAirportTraffic(string ident, double min_dist = 0.0);
+       void GenerateSimpleAirportTraffic(const string& ident, double min_dist = 0.0);
        
        // Search for valid airports in the vicinity of the user and activate them if necessary
        void SearchByPos(double range);
@@ -130,7 +130,7 @@ private:
        
        string GenerateUniqueCallsign();
        
-       string GenerateShortForm(string callsign, string plane_str = "Cessna-", bool local = false);
+       string GenerateShortForm(const string& callsign, const string& plane_str = "Cessna-", bool local = false);
        
        // TODO - implement a proper robust system for registering and loading AI GA aircraft models
        bool _havePiperModel;