X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FTraffic%2FSchedFlight.hxx;h=0ee3eb6bd1f9c5b3056daa27b0488810ec53c59b;hb=474789269b7656509f62339c17e62a55b6157d43;hp=2396ae84b4f703e91bd8d9dba18702accc3021b3;hpb=5bc15d7a69813e97a7146742e3b2aa2d784eab73;p=flightgear.git

diff --git a/src/Traffic/SchedFlight.hxx b/src/Traffic/SchedFlight.hxx
index 2396ae84b..0ee3eb6bd 100644
--- a/src/Traffic/SchedFlight.hxx
+++ b/src/Traffic/SchedFlight.hxx
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  *
  **************************************************************************/
@@ -43,7 +43,7 @@
 
 using namespace std;
 
-SG_USING_STD(vector);
+using std::vector;
 
 
 class FGScheduledFlight
@@ -55,11 +55,14 @@ private:
   FGAirport *arrivalPort;
   string depId;
   string arrId;
+  string requiredAircraft;
   time_t departureTime;
   time_t arrivalTime;
   time_t repeatPeriod;
   int cruiseAltitude;
+  
   bool initialized;
+  bool available;
 
  
  
@@ -67,14 +70,15 @@ public:
   FGScheduledFlight();
   FGScheduledFlight(const FGScheduledFlight &other);
   //  FGScheduledFlight(const string);
-  FGScheduledFlight::FGScheduledFlight(string cs,
-		     string fr,
-		     string depPrt,
-		     string arrPrt,
+  FGScheduledFlight(const string& cs,
+		     const string& fr,
+		     const string& depPrt,
+		     const string& arrPrt,
 		     int cruiseAlt,
-		     string deptime,
-		     string arrtime,
-		     string rep
+		     const string& deptime,
+		     const string& arrtime,
+		     const string& rep,
+                     const string& reqAC
 		     );
   ~FGScheduledFlight();
 
@@ -95,13 +99,24 @@ public:
   { 
     return (departureTime < other.departureTime); 
   };
+  string& getFlightRules() { return fltRules; };
+
+  time_t processTimeString(const string& time);
+  const string& getCallSign() {return callsign; };
+  const string& getRequirement() { return requiredAircraft; }
+
+  void lock() { available = false; };
+  void release() { available = true; };
 
-  time_t processTimeString(string time);
-  string getCallSign() {return callsign; };
+  bool isAvailable() { return available; };
 };
 
-typedef vector<FGScheduledFlight>           FGScheduledFlightVec;
-typedef vector<FGScheduledFlight>::iterator FGScheduledFlightVecIterator;
+typedef vector<FGScheduledFlight*>           FGScheduledFlightVec;
+typedef vector<FGScheduledFlight*>::iterator FGScheduledFlightVecIterator;
+
+typedef std::map < std::string, FGScheduledFlightVec > FGScheduledFlightMap;
+
+bool compareScheduledFlights(FGScheduledFlight *a, FGScheduledFlight *b);
 
 
 #endif