Fix Carriers without catapults and wires.

[flightgear.git] / src / Instrumentation / mk_viii.hxx

diff --git a/src/Instrumentation/mk_viii.hxx b/src/Instrumentation/mk_viii.hxx
index 249bdf023c5c19d45fceee34911c4c815f79479b..afacd10fd4bc0cbd89fcf786db085bf6efcd3c8d 100755 (executable)
--- a/src/Instrumentation/mk_viii.hxx
+++ b/src/Instrumentation/mk_viii.hxx
@@ -36,9 +36,9 @@ using std::vector;
 using std::deque;
 using std::map;
 
-#include "Airports/runways.hxx"
-#include "Airports/simple.hxx"
-#include "Main/globals.hxx"
+#include <Airports/runways.hxx>
+#include <Airports/simple.hxx>
+#include <Main/globals.hxx>
 
 ///////////////////////////////////////////////////////////////////////////////
 // MK_VIII ////////////////////////////////////////////////////////////////////
@@ -1505,13 +1505,17 @@ private:
     unsigned int get_bank_angle_alerts ();
     void update_bank_angle ();
     
-    class AirportFilter : public FGPositioned::Filter
+    class AirportFilter : public FGAirport::AirportFilter
     {
     public: 
       AirportFilter(Mode6Handler *s)
         : self(s) {}
         
-      virtual bool pass(FGPositioned *a) const;
+      virtual bool passAirport(FGAirport *a) const;
+      
+      virtual FGPositioned::Type maxType() const {
+        return FGPositioned::AIRPORT;
+      }
       
     private:
       Mode6Handler* self;
@@ -1578,14 +1582,17 @@ private:
     bool is_tcf ();
     bool is_rfcf ();
 
-    class AirportFilter : public FGPositioned::Filter
+    class AirportFilter : public FGAirport::AirportFilter
     {
     public: 
       AirportFilter(MK_VIII *device)
         : mk(device) {}
         
-      virtual bool pass(FGPositioned *a) const;
+      virtual bool passAirport(FGAirport *a) const;
       
+      virtual FGPositioned::Type maxType() const {
+        return FGPositioned::AIRPORT;
+      }
     private:
       MK_VIII* mk;
     };