Merge branch 'maint' into next

[flightgear.git] / src / Scripting / NasalSys.cxx

diff --git a/src/Scripting/NasalSys.cxx b/src/Scripting/NasalSys.cxx
index af2d51c662a319bd47e82f817b5cfc56cf59593f..1941712eca92487f1ccd2b8add2ea9a9fc0cadba 100644 (file)
--- a/src/Scripting/NasalSys.cxx
+++ b/src/Scripting/NasalSys.cxx
@@ -497,19 +497,22 @@ static naRef f_geodinfo(naContext c, naRef me, int argc, naRef* args)
 #undef HASHSET
 }
 
-class AirportInfoFilter : public FGPositioned::Filter
+class AirportInfoFilter : public FGAirport::AirportFilter
 {
 public:
   AirportInfoFilter() :
     type(FGPositioned::AIRPORT)
   { }
   
-  virtual bool pass(FGPositioned* aPos) const
-  {
-    return (aPos->type() == type);
+  virtual FGPositioned::Type minType() const {
+    return type;
   }
   
-  FGPositioned::Type type;
+  virtual FGPositioned::Type maxType() const {
+    return type;
+  }
+  
+ FGPositioned::Type type;
 };
 
 // Returns data hash for particular or nearest airport of a <type>, or nil