Use an SGGeod inside FGAIFlightPlan::Waypoint.

[flightgear.git] / src / AIModel / AIManager.cxx

diff --git a/src/AIModel/AIManager.cxx b/src/AIModel/AIManager.cxx
index 2ad54837113ec7a6d5e22ca48583208603d54c82..c5ea283fc56c6eacf30b25ac7309dd2923900329 100644 (file)
--- a/src/AIModel/AIManager.cxx
+++ b/src/AIModel/AIManager.cxx
@@ -69,10 +69,7 @@ void
 FGAIManager::init() {
     root = fgGetNode("sim/ai", true);
 
-    enabled = root->getNode("enabled", true)->getBoolValue();
-
-    if (!enabled)
-        return;
+    enabled = root->getNode("enabled", true);
 
     thermal_lift_node = fgGetNode("/environment/thermal-lift-fps", true);
     wind_from_east_node  = fgGetNode("/environment/wind-from-east-fps",true);
@@ -92,6 +89,15 @@ FGAIManager::init() {
 void
 FGAIManager::postinit() {
     // postinit, so that it can access the Nasal subsystem
+
+    if (!root->getBoolValue("scenarios-enabled", true))
+        return;
+
+    // scenarios enabled, AI subsystem required
+    if (!enabled->getBoolValue())
+        enabled->setBoolValue(true);
+
+    // process all scenarios
     map<string, bool> scenarios;
     for (int i = 0 ; i < root->nChildren() ; i++) {
         SGPropertyNode *n = root->getChild(i);
@@ -103,11 +109,11 @@ FGAIManager::postinit() {
             continue;
 
         if (scenarios.find(name) != scenarios.end()) {
-            SG_LOG(SG_GENERAL, SG_DEBUG, "won't load scenario '" << name << "' twice");
+            SG_LOG(SG_AI, SG_DEBUG, "won't load scenario '" << name << "' twice");
             continue;
         }
 
-        SG_LOG(SG_GENERAL, SG_ALERT, "loading scenario '" << name << '\'');
+        SG_LOG(SG_AI, SG_ALERT, "loading scenario '" << name << '\'');
         processScenario(name);
         scenarios[name] = true;
     }
@@ -143,10 +149,10 @@ FGAIManager::update(double dt) {
     range_nearest = 10000.0;
     strength = 0.0;
 
-    if (!enabled)
+    if (!enabled->getBoolValue())
         return;
 
-    FGTrafficManager *tmgr = (FGTrafficManager*) globals->get_subsystem("Traffic Manager");
+    FGTrafficManager *tmgr = (FGTrafficManager*) globals->get_subsystem("traffic-manager");
     _dt = dt;
 
     ai_list_iterator ai_list_itr = ai_list.begin();
@@ -376,7 +382,7 @@ FGAIManager::loadScenarioFile(const std::string& filename)
         readProperties(path.str(), root);
         return root;
     } catch (const sg_exception &t) {
-        SG_LOG(SG_GENERAL, SG_ALERT, "Failed to load scenario '"
+        SG_LOG(SG_AI, SG_ALERT, "Failed to load scenario '"
             << path.str() << "': " << t.getFormattedMessage());
         return 0;
     }
@@ -437,7 +443,7 @@ FGAIManager::calcCollision(double alt, double lat, double lon, double fuse_range
 
         if (fabs(tgt_alt - alt) > tgt_ht[type] || type == FGAIBase::otBallistic
             || type == FGAIBase::otStorm || type == FGAIBase::otThermal ) {
-                //SG_LOG(SG_GENERAL, SG_DEBUG, "AIManager: skipping "
+                //SG_LOG(SG_AI, SG_DEBUG, "AIManager: skipping "
                 //    << fabs(tgt_alt - alt)
                 //    << " "
                 //    << type
@@ -452,7 +458,7 @@ FGAIManager::calcCollision(double alt, double lat, double lon, double fuse_range
 
         double range = calcRange(lat, lon, tgt_lat, tgt_lon);
 
-        //SG_LOG(SG_GENERAL, SG_DEBUG, "AIManager:  AI list size "
+        //SG_LOG(SG_AI, SG_DEBUG, "AIManager:  AI list size "
         //    << ai_list.size()
         //    << " type " << type
         //    << " ID " << id
@@ -464,7 +470,7 @@ FGAIManager::calcCollision(double alt, double lat, double lon, double fuse_range
         tgt_length[type] += fuse_range;
 
         if (range < tgt_length[type]){
-            SG_LOG(SG_GENERAL, SG_DEBUG, "AIManager: HIT! "
+            SG_LOG(SG_AI, SG_DEBUG, "AIManager: HIT! "
                 << " type " << type
                 << " ID " << id
                 << " range " << range