Modified Files:

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

diff --git a/src/Traffic/TrafficMgr.hxx b/src/Traffic/TrafficMgr.hxx
index ab39afcf732c82e262ddbdd5003fa45cc65246f5..4a46fcbeb7a68d9baccc65c68420c99dd5c0e62a 100644 (file)
--- a/src/Traffic/TrafficMgr.hxx
+++ b/src/Traffic/TrafficMgr.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.
  *
  *
  **************************************************************************/
@@ -34,21 +34,23 @@
 #include "Schedule.hxx"
 
 
-typedef vector<void *> IdList;
-typedef vector<void *>::iterator IdListIterator;
+typedef vector<int> IdList;
+typedef vector<int>::iterator IdListIterator;
 
 
 class FGTrafficManager : public SGSubsystem, public XMLVisitor
 {
 private:
   ScheduleVector scheduledAircraft;
-  ScheduleVectorIterator currAircraft;
+  ScheduleVectorIterator currAircraft, currAircraftClosest;
   string value;
 
   string mdl, livery, registration, callsign, fltrules, 
     port, timeString, departurePort, departureTime, arrivalPort, arrivalTime,
-    repeat;
+    repeat, acType, airline, m_class, flighttype;
   int cruiseAlt;
+  int score, runCount;
+  double radius, offset;
   bool heavy;
 
   IdList releaseList;
@@ -57,11 +59,11 @@ private:
 
 public:
   FGTrafficManager();
-  
+  ~FGTrafficManager();
   void init();
   void update(double time);
-  void release(void *ref);
-  bool isReleased(void *id);
+  void release(int ref);
+  bool isReleased(int id);
 
   // Some overloaded virtual XMLVisitor members
   virtual void startXML ();