Merge branch 'next' of gitorious.org:fg/flightgear into next

[flightgear.git] / src / Airports / runwayprefs.hxx

diff --git a/src/Airports/runwayprefs.hxx b/src/Airports/runwayprefs.hxx
index 83e35cdaca6f463101955fa917fc954298291968..c9ac72709c82e4e0c0e00c8ead197a5ac155bebf 100644 (file)
--- a/src/Airports/runwayprefs.hxx
+++ b/src/Airports/runwayprefs.hxx
@@ -30,8 +30,8 @@
 
 #include <simgear/compiler.h>
 
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::vector;
+using std::string;
 
 typedef vector<time_t> timeVec;
 typedef vector<time_t>::const_iterator timeVecConstIterator;
@@ -112,7 +112,7 @@ public:
 
   void setName(const string& nm) { name = nm;                };
   void add(const RunwayList& list) { rwyList.push_back(list);};
-  void setActive(const string& aptId, double windSpeed, double windHeading, double maxTail, double maxCross, stringVec *curr);
+  void setActive(const FGAirport* airport, double windSpeed, double windHeading, double maxTail, double maxCross, stringVec *curr);
 
   int getNrActiveRunways() { return nrActive;};
   void getActive(int i, string& name, string& type);
@@ -135,6 +135,7 @@ private:
   ScheduleTime comTimes; // Commercial Traffic;
   ScheduleTime genTimes; // General Aviation;
   ScheduleTime milTimes; // Military Traffic;
+  ScheduleTime ulTimes;  // Ultralight Traffic
 
   PreferenceList preferences;
   
@@ -157,6 +158,7 @@ public:
   void setMilTimes(ScheduleTime& t) { milTimes = t; };
   void setGenTimes(ScheduleTime& t) { genTimes = t; };
   void setComTimes(ScheduleTime& t) { comTimes = t; };
+  void setULTimes (ScheduleTime& t) { ulTimes  = t; };
 
   void addRunwayGroup(RunwayGroup& g) { preferences.push_back(g); };
 };