Modifications to incorporate Jon S. Berndts flight model code.

[flightgear.git] / Main / options.hxx

diff --git a/Main/options.hxx b/Main/options.hxx
index 491f3a7b6f5e003f5385487553ba4e4ae7c824db..3c6a3849d4dff8527f93261df92428c7b8beada9 100644 (file)
--- a/Main/options.hxx
+++ b/Main/options.hxx
@@ -34,6 +34,8 @@
 #  include <config.h>
 #endif
 
+#include <Include/compiler.h>
+
 #ifdef HAVE_WINDOWS_H
 #  include <windows.h>
 #endif
@@ -41,11 +43,19 @@
 #include <GL/glut.h>
 #include <XGL/xgl.h>
 
-#include <string>
-#include <Include/compiler.h>
+#include STL_STRING
 FG_USING_STD(string);
 
-#include "fg_serial.hxx"
+#include <vector>
+#include "Include/compiler.h"
+FG_USING_STD(vector);
+FG_USING_STD(string);
+// #include "fg_serial.hxx"
+
+
+typedef vector < string > str_container;
+typedef str_container::iterator str_iterator;
+typedef str_container::const_iterator const_str_iterator;
 
 
 class fgOPTIONS {
@@ -139,10 +149,7 @@ private:
     // fgSerialPortKind port_d_kind;  // Port d kind
 
     // Serial port configuration strings
-    string port_a_config;
-    string port_b_config;
-    string port_c_config;
-    string port_d_config;
+    str_container port_options_list;
     
 public:
 
@@ -197,15 +204,9 @@ public:
 
     inline int get_time_offset() const { return time_offset; }
 
-    // inline fgSerialPortKind get_port_a_kind() const { return port_a_kind; }
-    // inline fgSerialPortKind get_port_b_kind() const { return port_b_kind; }
-    // inline fgSerialPortKind get_port_c_kind() const { return port_c_kind; }
-    // inline fgSerialPortKind get_port_d_kind() const { return port_d_kind; }
-
-    inline string get_port_a_config() const { return port_a_config; }
-    inline string get_port_b_config() const { return port_b_config; }
-    inline string get_port_c_config() const { return port_c_config; }
-    inline string get_port_d_config() const { return port_d_config; }
+    inline str_container get_port_options_list() const { 
+       return port_options_list;
+    }
 
     // Update functions
     inline void set_hud_status( bool status ) { hud_status = status; }
@@ -231,7 +232,7 @@ private:
     double parse_degree( const string& degree_str );
     int parse_time_offset( const string& time_str );
     int parse_tile_radius( const string& arg );
-    int parse_flight_model( const string& fm );
+    int parse_fdm( const string& fm );
     double parse_fov( const string& arg );
     bool parse_serial( const string& serial_str );
 };
@@ -244,6 +245,31 @@ extern fgOPTIONS current_options;
 
 
 // $Log$
+// Revision 1.27  1999/02/05 21:29:13  curt
+// Modifications to incorporate Jon S. Berndts flight model code.
+//
+// Revision 1.26  1999/02/02 20:13:37  curt
+// MSVC++ portability changes by Bernie Bright:
+//
+// Lib/Serial/serial.[ch]xx: Initial Windows support - incomplete.
+// Simulator/Astro/stars.cxx: typo? included <stdio> instead of <cstdio>
+// Simulator/Cockpit/hud.cxx: Added Standard headers
+// Simulator/Cockpit/panel.cxx: Redefinition of default parameter
+// Simulator/Flight/flight.cxx: Replaced cout with FG_LOG.  Deleted <stdio.h>
+// Simulator/Main/fg_init.cxx:
+// Simulator/Main/GLUTmain.cxx:
+// Simulator/Main/options.hxx: Shuffled <fg_serial.hxx> dependency
+// Simulator/Objects/material.hxx:
+// Simulator/Time/timestamp.hxx: VC++ friend kludge
+// Simulator/Scenery/tile.[ch]xx: Fixed using std::X declarations
+// Simulator/Main/views.hxx: Added a constant
+//
+// Revision 1.25  1999/01/19 20:57:06  curt
+// MacOS portability changes contributed by "Robert Puyol" <puyol@abvent.fr>
+//
+// Revision 1.24  1998/11/25 01:34:01  curt
+// Support for an arbitrary number of serial ports.
+//
 // Revision 1.23  1998/11/23 21:49:05  curt
 // Borland portability tweaks.
 //