Added support for the External flight model.

diff --git a/Main/Makefile.am b/Main/Makefile.am
index fd28c121bf047fa5b244593f85f57c77b76013bf..c116729e661bfecaadf1ec54830d39e45fc79252 100644 (file)
--- a/Main/Makefile.am
+++ b/Main/Makefile.am
@@ -51,6 +51,7 @@ fgfs_LDADD = \
        $(top_builddir)/Simulator/Cockpit/libCockpit.a \
        $(top_builddir)/Simulator/Controls/libControls.a \
        $(top_builddir)/Simulator/Flight/libFlight.a \
+       $(top_builddir)/Simulator/Flight/External/libExternal.a \
        $(top_builddir)/Simulator/Flight/LaRCsim/libLaRCsim.a \
        $(top_builddir)/Simulator/Flight/Slew/libSlew.a \
        $(top_builddir)/Simulator/GUI/libGUI.a \

diff --git a/Main/options.cxx b/Main/options.cxx
index 256787e7e981a2c4e06bb9e0b6089f9f06100491..4067acf2791dd0dc8b60b44a9d2360a8eb1b27ec 100644 (file)
--- a/Main/options.cxx
+++ b/Main/options.cxx
@@ -129,7 +129,7 @@ fgOPTIONS::fgOPTIONS() :
     sound(1),
 
     // Flight Model options
-    flight_model(FG_LARCSIM),
+    flight_model(fgFLIGHT::FG_LARCSIM),
 
     // Rendering options
     fog(FG_FOG_NICEST),  // nicest
@@ -310,9 +310,11 @@ fgOPTIONS::parse_flight_model( const string& fm ) {
     // printf("flight model = %s\n", fm);
 
     if ( fm == "slew" ) {
-       return FG_SLEW;
+       return fgFLIGHT::FG_SLEW;
     } else if ( (fm == "larcsim") || (fm == "LaRCsim") ) {
-       return FG_LARCSIM;
+       return fgFLIGHT::FG_LARCSIM;
+    } else if ( fm == "external" ) {
+       return fgFLIGHT::FG_EXTERNAL;
     } else {
        FG_LOG( FG_GENERAL, FG_ALERT, "Unknown flight model = " << fm );
        exit(-1);
@@ -569,6 +571,10 @@ void fgOPTIONS::usage ( void ) {
     printf("\t--enable-sound:  enable sound effects\n");
     printf("\n");
  
+    printf("Flight Model:\n");
+    printf("\t--flight-mode=abcd:  one of slew, larcsim, or external\n");
+    printf("\n");
+
     printf("Initial Position and Orientation:\n");
     printf("\t--airport-id=ABCD:  specify starting postion by airport id\n");
     printf("\t--lon=degrees:  starting longitude in degrees (west = -)\n");
@@ -618,6 +624,9 @@ fgOPTIONS::~fgOPTIONS( void ) {
 
 
 // $Log$
+// Revision 1.33  1998/12/04 01:30:44  curt
+// Added support for the External flight model.
+//
 // Revision 1.32  1998/11/25 01:34:00  curt
 // Support for an arbitrary number of serial ports.
 //