Make sure the ATIS reports surface winds at airports above sea-level

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

diff --git a/src/ATC/AIMgr.cxx b/src/ATC/AIMgr.cxx
index 621bf5ec83b19f85b6735938cd85d4b65a6e2e72..58e9886794a733ca20b4223998f68b370584987a 100644 (file)
--- a/src/ATC/AIMgr.cxx
+++ b/src/ATC/AIMgr.cxx
@@ -56,6 +56,8 @@ FGAIMgr::FGAIMgr() {
 }
 
 FGAIMgr::~FGAIMgr() {
+       _defaultModel->deRef();
+       _piperModel->deRef();
 }
 
 void FGAIMgr::init() {
@@ -74,16 +76,20 @@ void FGAIMgr::init() {
        // Hack alert - Hardwired paths!!
        string planepath = "Aircraft/c172/Models/c172-dpm.ac";
        _defaultModel = sgLoad3DModel( globals->get_fg_root(),
-                                         planepath.c_str(),
-                                         globals->get_props(),
-                                         globals->get_sim_time_sec() );
-                                                                         
+                                      planepath.c_str(),
+                                      globals->get_props(),
+                                      globals->get_sim_time_sec() );
+
        planepath = "Aircraft/pa28-161/Models/pa28-161.ac";
        _piperModel = sgLoad3DModel( globals->get_fg_root(),
-                                         planepath.c_str(),
-                                         globals->get_props(),
-                                         globals->get_sim_time_sec() );
-                                                                         
+                                    planepath.c_str(),
+                                    globals->get_props(),
+                                    globals->get_sim_time_sec() );
+
+       // We need to keep one ref of the models open to stop ssg deleting them behind our back!
+       _defaultModel->ref();
+       _piperModel->ref();
+
        // go through the $FG_ROOT/ATC directory and find all *.taxi files
        SGPath path(globals->get_fg_root());
        path.append("ATC/");
@@ -92,50 +98,14 @@ void FGAIMgr::init() {
        string file, f_ident;
        int pos;
        
-       // WARNING - I (DCL) haven't tested this on MSVC - this is simply cribbed from TerraGear
-#ifdef _MSC_VER        
-       long hfile;
-       struct _finddata_t de;
-       string path_str;
-       
-       path_str = dir + "\\*.*";
+       ulDir *d;
+       struct ulDirEnt *de;
        
-       if ( ( hfile = _findfirst( path.c_str(), &de ) ) == -1 ) {
-               SG_LOG(SG_ATC, SG_WARN, "cannot open directory " << dir);
-       } else {                
-               // load all .taxi files
-               do {
-                       file = de.name;
-                       pos = file.find(".");
-                       ext = file.substr(pos + 1);
-                       if(ext == "taxi") {
-                               f_ident = file.substr(0, pos);
-                               FGAirport a;
-                               if(dclFindAirportID(f_ident, &a)) {
-                                       SGBucket sgb(a.longitude, a.latitude);
-                                       int idx = sgb.gen_index();
-                                       if(facilities.find(idx) != facilities.end()) {
-                                               facilities[idx]->push_back(f_ident);
-                                       } else {
-                                               ID_list_type* apts = new ID_list_type;
-                                               apts->push_back(f_ident);
-                                               facilities[idx] = apts;
-                                       }
-                                       SG_LOG(SG_ATC, SG_BULK, "Mapping " << f_ident << " to bucket " << idx); 
-                               }
-                       }
-               } while ( _findnext( hfile, &de ) == 0 );
-       }
-#else
-
-    DIR *d;
-    struct dirent *de;
-
-    if ( (d = opendir( dir.c_str() )) == NULL ) {
+       if ( (d = ulOpenDir( dir.c_str() )) == NULL ) {
                SG_LOG(SG_ATC, SG_WARN, "cannot open directory " << dir);
        } else {
                // load all .taxi files
-               while ( (de = readdir(d)) != NULL ) {
+               while ( (de = ulReadDir(d)) != NULL ) {
                        file = de->d_name;
                        pos = file.find(".");
                        ext = file.substr(pos + 1);
@@ -143,7 +113,7 @@ void FGAIMgr::init() {
                                f_ident = file.substr(0, pos);
                                FGAirport a;
                                if(dclFindAirportID(f_ident, &a)) {
-                                       SGBucket sgb(a.longitude, a.latitude);
+                                       SGBucket sgb(a._longitude, a._latitude);
                                        int idx = sgb.gen_index();
                                        if(facilities.find(idx) != facilities.end()) {
                                                facilities[idx]->push_back(f_ident);
@@ -156,10 +126,9 @@ void FGAIMgr::init() {
                                }
                        }
                }               
-               closedir(d);
+               ulCloseDir(d);
        }
-#endif
-       
+
        // See if are in range at startup and activate if necessary
        SearchByPos(15.0);
        
@@ -254,7 +223,7 @@ void FGAIMgr::update(double dt) {
                                bool gen = false;
                                //cout << "Size of list is " << (*it).second.size() << " at " << s << '\n';
                                if((*it).second.size()) {
-                                       FGAIEntity* e = *((*it).second.rbegin());
+                                       FGAIEntity* e = *((*it).second.rbegin());       // Get the last airplane currently scheduled to arrive at this airport.
                                        cd = dclGetHorizontalSeparation(e->GetPos(), dclGetAirportPos(s));
                                        if(cd < (d < 5000 ? 10000 : d + 5000)) {
                                                gen = true;
@@ -266,7 +235,8 @@ void FGAIMgr::update(double dt) {
                                if(gen) {
                                        //cout << "Generating extra traffic at airport " << s << ", at least " << cd << " meters out\n";
                                        //GenerateSimpleAirportTraffic(s, cd);
-                                       GenerateSimpleAirportTraffic(s, cd + 2000.0);   // The random seems a bit wierd - traffic could get far too bunched without the +2000.
+                                       GenerateSimpleAirportTraffic(s, cd + 3000.0);   // The random seems a bit wierd - traffic could get far too bunched without the +3000.
+                                       // TODO - make the anti-random constant variable depending on the ai-traffic level.
                                }
                        }
                        ++it;
@@ -473,6 +443,7 @@ void FGAIMgr::GenerateSimpleAirportTraffic(string ident, double min_dist) {
                        double dir = int(sg_random() * 36);
                        if(dir == 36) dir--;
                        dir *= 10;
+                       
                        if(sg_random() < 0.3) cessna = false;
                        else cessna = true;
                        string s = GenerateShortForm(GenerateUniqueCallsign(), (cessna ? "Cessna-" : "Piper-"));