Interim windows build fix

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

diff --git a/src/Airports/dynamics.hxx b/src/Airports/dynamics.hxx
index 75a97f59873962c1c774e15bead4444cb66a9158..cef41fa48434bb89a7e87dd3880faf5e0964a886 100644 (file)
--- a/src/Airports/dynamics.hxx
+++ b/src/Airports/dynamics.hxx
@@ -24,10 +24,13 @@
 
 #include <set>
 
+#include <simgear/structure/SGReferenced.hxx>
+
 #include <ATC/trafficcontrol.hxx>
+#include <ATC/GroundController.hxx>
+
 #include "airports_fwd.hxx"
 #include "parking.hxx"
-#include "groundnetwork.hxx"
 #include "runwayprefs.hxx"
 
 class ParkingAssignment
@@ -37,7 +40,7 @@ public:
   ~ParkingAssignment();
   
 // create a parking assignment (and mark it as unavailable)
-  ParkingAssignment(FGParking* pk, FGAirport* apt);
+  ParkingAssignment(FGParking* pk, FGAirportDynamics* apt);
   
   ParkingAssignment(const ParkingAssignment& aOther);
   void operator=(const ParkingAssignment& aOther);
@@ -53,7 +56,8 @@ private:
   ParkingAssignmentPrivate* _sharedData;
 };
 
-class FGAirportDynamics {
+class FGAirportDynamics : public SGReferenced
+{
 
 private:
     FGAirport* _ap;
@@ -63,12 +67,13 @@ private:
     ParkingSet occupiedParkings;
 
 
+    std::auto_ptr<FGGroundNetwork> groundNetwork;
 
     FGRunwayPreference   rwyPrefs;
     FGStartupController  startupController;
-    FGGroundNetwork      groundNetwork;
     FGTowerController    towerController;
     FGApproachController approachController;
+    FGGroundController   groundController;
 
     time_t lastUpdate;
     std::string prevTrafficType;
@@ -95,7 +100,7 @@ private:
                                bool skipEmptyAirlineCode);
 public:
     FGAirportDynamics(FGAirport* ap);
-    ~FGAirportDynamics();
+    virtual ~FGAirportDynamics();
 
     void addAwosFreq     (int val) {
         freqAwos.push_back(val);
@@ -140,7 +145,6 @@ public:
   
     bool isParkingAvailable(FGParking* parking) const;
   
-    FGParkingRef getParking(FGParking* i) const;
     void releaseParking(FGParking* id);
 
     FGParkingList getParkings(bool onlyAvailable, const std::string& type) const;
@@ -156,8 +160,8 @@ public:
     FGStartupController    *getStartupController()    {
         return &startupController;
     };
-    FGGroundNetwork        *getGroundNetwork()        {
-        return &groundNetwork;
+    FGGroundController        *getGroundController()        {
+        return &groundController;
     };
     FGTowerController      *getTowerController()      {
         return &towerController;
@@ -166,6 +170,11 @@ public:
         return &approachController;
     };
 
+    FGGroundNetwork* getGroundNetwork() const
+    {
+        return groundNetwork.get();
+    }
+
     int getGroundFrequency(unsigned leg);
     int getTowerFrequency  (unsigned nr);