Fixed an property tieing issue on sim reset.

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

diff --git a/src/Traffic/TrafficMgr.hxx b/src/Traffic/TrafficMgr.hxx
index 6c72ce95ceec1163e2ba0aa0ef578bc89b7e14c5..ab1e19880deea5faeb6aadad453539df1212e3cd 100644 (file)
--- a/src/Traffic/TrafficMgr.hxx
+++ b/src/Traffic/TrafficMgr.hxx
@@ -47,6 +47,7 @@
 #define _TRAFFICMGR_HXX_
 
 #include <simgear/structure/subsystem_mgr.hxx>
+#include <simgear/props/propertyObject.hxx>
 #include <simgear/xml/easyxml.hxx>
 #include <simgear/misc/sg_path.hxx>
 
@@ -54,22 +55,22 @@
 #include "Schedule.hxx"
 
 
-typedef vector<int> IdList;
-typedef vector<int>::iterator IdListIterator;
+typedef std::vector<int> IdList;
+typedef std::vector<int>::iterator IdListIterator;
 
 class Heuristic
 {
 public:
-   string registration;
+   std::string registration;
    unsigned int runCount;
    unsigned int hits;
 };
 
-typedef vector<Heuristic*> heuristicsVector;
-typedef vector<Heuristic*>::iterator heuristicsVectorIterator;
+typedef std::vector<Heuristic> heuristicsVector;
+typedef std::vector<Heuristic>::iterator heuristicsVectorIterator;
 
-typedef std::map < std::string, Heuristic *> HeuristicMap;
-typedef HeuristicMap::iterator               HeuristicMapIterator;
+typedef std::map < std::string, Heuristic> HeuristicMap;
+typedef HeuristicMap::iterator             HeuristicMapIterator;
 
 
 
@@ -77,11 +78,13 @@ typedef HeuristicMap::iterator               HeuristicMapIterator;
 class FGTrafficManager : public SGSubsystem, public XMLVisitor
 {
 private:
+  bool inited;
+  
   ScheduleVector scheduledAircraft;
   ScheduleVectorIterator currAircraft, currAircraftClosest;
   vector<string> elementValueStack;
 
-  string mdl, livery, registration, callsign, fltrules, 
+  std::string mdl, livery, registration, callsign, fltrules, 
     port, timeString, departurePort, departureTime, arrivalPort, arrivalTime,
     repeat, acType, airline, m_class, flighttype, requiredAircraft, homePort;
   int cruiseAlt;
@@ -93,9 +96,10 @@ private:
     
   FGScheduledFlightMap flights;
 
-  //void readTimeTableFromFile(SGPath infilename);
-  //void Tokenize(const string& str, vector<string>& tokens, const string& delimiters = " ");
+  void readTimeTableFromFile(SGPath infilename);
+  void Tokenize(const string& str, vector<string>& tokens, const string& delimiters = " ");
 
+  simgear::PropertyObject<bool> enabled, aiEnabled, realWxEnabled, metarValid;
 public:
   FGTrafficManager();
   ~FGTrafficManager();