Merge branch 'next' into durk-atc

[flightgear.git] / src / Traffic / TrafficMgr.cxx

diff --git a/src/Traffic/TrafficMgr.cxx b/src/Traffic/TrafficMgr.cxx
index 765c870fd17a95ea836b76355ca827bdfc7de7d1..9ebf78c1c7c063e80ba68352d1d4073131d4a3a8 100644 (file)
--- a/src/Traffic/TrafficMgr.cxx
+++ b/src/Traffic/TrafficMgr.cxx
@@ -79,6 +79,7 @@ FGTrafficManager::FGTrafficManager() :
   inited(false),
   enabled("/sim/traffic-manager/enabled"),
   aiEnabled("/sim/ai/enabled"),
+  realWxEnabled("/environment/realwx/enabled"),
   metarValid("/environment/metar/valid")
 {
     //score = 0;
@@ -232,7 +233,7 @@ void FGTrafficManager::init()
 
 void FGTrafficManager::update(double /*dt */ )
 {
-    if (!enabled || !aiEnabled || !metarValid) {
+    if (!enabled || !aiEnabled || (realWxEnabled && !metarValid)) {
         return;
     }
         
@@ -257,6 +258,7 @@ void FGTrafficManager::update(double /*dt */ )
     }
     //cerr << "Processing << " << (*currAircraft)->getRegistration() << " with score " << (*currAircraft)->getScore() << endl;
     if (!((*currAircraft)->update(now, userCart))) {
+        (*currAircraft)->taint();
         // NOTE: With traffic manager II, this statement below is no longer true
         // after proper initialization, we shouldnt get here.
         // But let's make sure