- catch exception from readProperties and exit

[flightgear.git] / src / FDM / flight.hxx

diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx
index 20e22678098e928a6c5c9a7fc75fba30da5fbbdb..a09520f2d44148b147b76bd20a317f4b4e471d90 100644 (file)
--- a/src/FDM/flight.hxx
+++ b/src/FDM/flight.hxx
@@ -274,7 +274,11 @@ private:
     double altitude_agl;
     double Tank1Fuel;             // Gals
     double Tank2Fuel;             // Gals
-    
+
+    double daux[16];           // auxilliary doubles
+    float  faux[16];           // auxilliary floats
+    int    iaux[16];           // auxilliary ints
+
     // Engine list
     engine_list engines;
 
@@ -442,6 +446,10 @@ protected:
        cos_latitude = cos(parm);
     }
 
+    inline void _set_daux( int n, double value ) { daux[n] = value; }
+    inline void _set_faux( int n, float value ) { faux[n] = value; }
+    inline void _set_iaux( int n, int value ) { iaux[n] = value; }
+
 public:
   
     FGInterface();
@@ -453,8 +461,8 @@ public:
     virtual void unbind ();
     virtual void update ();
     virtual bool update( int multi_loop );
-    virtual bool ToggleDataLogging(bool state) {};
-    virtual bool ToggleDataLogging(void) {};
+    virtual bool ToggleDataLogging(bool state) { return false; }
+    virtual bool ToggleDataLogging(void) { return false; }
 
     // Define the various supported flight models (many not yet implemented)
     enum {
@@ -514,13 +522,25 @@ public:
     virtual void set_V_calibrated_kts(double vc);
     virtual void set_Mach_number(double mach);
     virtual void set_Velocities_Local( double north, double east, double down );
-    inline void set_V_north (double north) { v_local_v[0] = north; }
-    inline void set_V_east (double east) { v_local_v[1] = east; }
-    inline void set_V_down (double down) { v_local_v[2] = down; }
+    inline void set_V_north (double north) { 
+      set_Velocities_Local(north, v_local_v[1], v_local_v[2]);
+    }
+    inline void set_V_east (double east) { 
+      set_Velocities_Local(v_local_v[0], east, v_local_v[2]);
+    }
+    inline void set_V_down (double down) { 
+      set_Velocities_Local(v_local_v[0], v_local_v[1], down);
+    }
     virtual void set_Velocities_Wind_Body( double u, double v, double w);
-    virtual void set_uBody (double uBody) { v_wind_body_v[0] = uBody; }
-    virtual void set_vBody (double vBody) { v_wind_body_v[1] = vBody; }
-    virtual void set_wBody (double wBody) { v_wind_body_v[2] = wBody; }
+    virtual void set_uBody (double uBody) { 
+      set_Velocities_Wind_Body(uBody, v_wind_body_v[1], v_wind_body_v[2]);
+    }
+    virtual void set_vBody (double vBody) { 
+      set_Velocities_Wind_Body(v_wind_body_v[0], vBody, v_wind_body_v[2]);
+    }
+    virtual void set_wBody (double wBody) {
+      set_Velocities_Wind_Body(v_wind_body_v[0], v_wind_body_v[1], wBody);
+    }
     
     // Euler angles 
     virtual void set_Euler_Angles( double phi, double theta, double psi );
@@ -1107,6 +1127,11 @@ public:
        return cos_latitude;
     }
 
+    // Auxilliary variables
+    inline double get_daux( int n ) const { return daux[n]; }
+    inline float  get_faux( int n ) const { return faux[n]; }
+    inline int    get_iaux( int n ) const { return iaux[n]; }
+
     // Consumables
     inline double get_Tank1Fuel() const { return Tank1Fuel; }
     inline double get_Tank2Fuel() const { return Tank2Fuel; }