A couple more tweaks to get UIUC flight model stuff to work.

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 7f237689cfe9f380a0d41cc045d767c2c1ae78b2..ab4e23e6a005885684775f9316775b3bf697ecb9 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -1296,9 +1296,11 @@ int main( int argc, char **argv ) {
     // seed the random number generater
     fg_srandom();
 
+    // AIRCRAFT defined in uiuc_aircraft.h
     // AIRCRAFTDIR defined in uiuc_aircraftdir.h
     aircraft_ = new AIRCRAFT;
     aircraftdir_ = new AIRCRAFTDIR;
+    aircraft_dir = ""; // Initialize the Aircraft directory to "" (UIUC)
 
     // Load the configuration parameters
     if ( !fgInitConfig(argc, argv) ) {

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index a447bb6703e7a3f1ec0a1a89289533dda533e41b..1a6a5a7e088f4ebb14c79fcb48e4f7b5d25662b4 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -195,8 +195,6 @@ fgOPTIONS::fgOPTIONS() :
 
     network_olk(false)
 {
-    aircraft_dir = ""; // Initialize the Aircraft directory to "" (UIUC)
-
     // set initial values/defaults
     time_offset_type=FG_TIME_SYS_OFFSET;
     char* envp = ::getenv( "FG_ROOT" );