Merge branch 'next' of gitorious.org:fg/flightgear into next

[flightgear.git] / src / Airports / runwayprefloader.cxx

diff --git a/src/Airports/runwayprefloader.cxx b/src/Airports/runwayprefloader.cxx
index b31bc60616449679d239bd7a8486409f545ad0c0..bfdcf8dd660d318c67c583c3fc0a311e82dae9c2 100644 (file)
--- a/src/Airports/runwayprefloader.cxx
+++ b/src/Airports/runwayprefloader.cxx
@@ -1,7 +1,27 @@
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+//
+
+#include <cstring>
+#include <cstdlib>
+
 #include <simgear/debug/logstream.hxx>
 
 #include "runwayprefloader.hxx"
 
+using namespace std;
+
 FGRunwayPreferenceXMLLoader::FGRunwayPreferenceXMLLoader(FGRunwayPreference* p):XMLVisitor(), _pref(p) {}
 
 void  FGRunwayPreferenceXMLLoader::startXML () {
@@ -99,6 +119,12 @@ void  FGRunwayPreferenceXMLLoader::endElement (const char * name) {
     _pref->setMilTimes(currTimes);
     currTimes.clear();
   }
+  if (!(strcmp(name, "ul"))) { // Military Traffic
+    //cerr << "Setting time table for military traffic" << endl;
+    _pref->setULTimes(currTimes);
+    currTimes.clear();
+  }
+
 
   if (!(strcmp(name, "takeoff"))) {
     //cerr << "Adding takeoff: " << value << endl;