Fix for bug 1304 - crash loading XML route

[flightgear.git] / src / FDM / YASim / FGFDM.hpp

diff --git a/src/FDM/YASim/FGFDM.hpp b/src/FDM/YASim/FGFDM.hpp
index 1df2c4872cffbde1d09454568d5cb10275e8842c..4601951bd8b7dd3cfb45823ebb8d01186c090ce2 100644 (file)
--- a/src/FDM/YASim/FGFDM.hpp
+++ b/src/FDM/YASim/FGFDM.hpp
@@ -49,13 +49,13 @@ private:
     bool eq(const char* a, const char* b);
     bool caseeq(const char* a, const char* b);
     char* dup(const char* s);
-    int attri(XMLAttributes* atts, char* attr);
-    int attri(XMLAttributes* atts, char* attr, int def); 
-    float attrf(XMLAttributes* atts, char* attr);
-    float attrf(XMLAttributes* atts, char* attr, float def); 
-    double attrd(XMLAttributes* atts, char* attr);
-    double attrd(XMLAttributes* atts, char* attr, double def); 
-    bool attrb(XMLAttributes* atts, char* attr);
+    int attri(XMLAttributes* atts, const char* attr);
+    int attri(XMLAttributes* atts, const char* attr, int def); 
+    float attrf(XMLAttributes* atts, const char* attr);
+    float attrf(XMLAttributes* atts, const char* attr, float def); 
+    double attrd(XMLAttributes* atts, const char* attr);
+    double attrd(XMLAttributes* atts, const char* attr, double def); 
+    bool attrb(XMLAttributes* atts, const char* attr);
 
     // The core Airplane object we manage.
     Airplane _airplane;
@@ -83,6 +83,29 @@ private:
     void* _currObj;
     bool _cruiseCurr;
     int _nextEngine;
+
+    class FuelProps
+    {
+    public:
+        SGPropertyNode_ptr _out_of_fuel;
+        SGPropertyNode_ptr _fuel_consumed_lbs;
+    };
+
+    class ThrusterProps
+    {
+    public:
+        SGPropertyNode_ptr _running, _cranking;
+        SGPropertyNode_ptr _prop_thrust, _thrust_lbs, _fuel_flow_gph;
+        SGPropertyNode_ptr _rpm, _torque_ftlb, _mp_osi, _mp_inhg;
+        SGPropertyNode_ptr _oil_temperature_degf, _boost_gauge_inhg;
+        SGPropertyNode_ptr _n1, _n2, _epr, _egt_degf;
+    };
+
+    SGPropertyNode_ptr _turb_magnitude_norm, _turb_rate_hz;
+    SGPropertyNode_ptr _gross_weight_lbs;
+    std::vector<SGPropertyNode_ptr> _tank_level_lbs;
+    std::vector<ThrusterProps> _thrust_props;
+    std::vector<FuelProps> _fuel_props;
 };
 
 }; // namespace yasim