Support for multiple data dirs.

[flightgear.git] / src / Main / fg_io.cxx

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index 4f27e276c574e7a93e0e721afa7e795d96665262..cd66cf0c6447a7b689067f5446cc57a286c4f13e 100644 (file)
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -65,7 +65,6 @@
 #include <Network/ray.hxx>
 #include <Network/rul.hxx>
 #include <Network/generic.hxx>
-#include <Network/HTTPClient.hxx>
 
 #ifdef FG_HAVE_HLA
 #include <Network/HLA/hla.hxx>
@@ -228,6 +227,20 @@ FGIO::parse_port_config( const string& config )
 #ifdef FG_HAVE_HLA
         else if ( protocol == "hla" ) {
             return new FGHLA(tokens);
+        }
+        else if ( protocol == "hla-local" ) {
+            // This is just about to bring up some defaults
+            if (tokens.size() != 2) {
+                SG_LOG( SG_IO, SG_ALERT, "Ignoring invalid --hla-local option "
+                        "(one argument expected: --hla-local=<federationname>" );
+                return NULL;
+            }
+            tokens.insert(tokens.begin(), "");
+            tokens.insert(tokens.begin(), "60");
+            tokens.insert(tokens.begin(), "bi");
+            tokens.push_back("fg-local.xml");
+            return new FGHLA(tokens);
+        }
 #endif
         else {
             return NULL;
@@ -381,10 +394,6 @@ FGIO::reinit()
 void
 FGIO::update( double /* delta_time_sec */ )
 {
-    if (FGHTTPClient::haveInstance()) {
-        FGHTTPClient::instance()->update();
-    }
-    
     // use wall-clock, not simulation, delta time, so that network
     // protocols update when the simulation is paused
     // see http://code.google.com/p/flightgear-bugs/issues/detail?id=125