Fix for bug 1304 - crash loading XML route

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

diff --git a/src/FDM/YASim/Hitch.hpp b/src/FDM/YASim/Hitch.hpp
old mode 100755 (executable)
new mode 100644 (file)
index d97fa9a..2badeb1
--- a/src/FDM/YASim/Hitch.hpp
+++ b/src/FDM/YASim/Hitch.hpp
@@ -1,7 +1,10 @@
 #ifndef _HITCH_HPP
 #define _HITCH_HPP
 
+#include <string>
+
 #include <Main/fg_props.hxx>
+#include <simgear/props/tiedpropertylist.hxx>
 
 namespace yasim {
 
@@ -48,7 +51,7 @@ public:
 
     void integrate (float dt);
 
-    const char *getConnectedPropertyNode() const;
+    std::string getConnectedPropertyNode() const;
     void setConnectedPropertyNode(const char *nodename);
 
 private:
@@ -74,12 +77,12 @@ private:
     float _forceMagnitude;
     double _global_ground[4];
     float _global_vel[3];
-    char _name[256];
+    //char _name[256];
     State* _state;
     float _dist;
     float _timeLagCorrectedDist;
     SGPropertyNode_ptr _towEndNode;
-    const char *_towEndPropertyName;
+    //const char *_towEndPropertyName;
     bool _towEndIsConnectedToProperty;
     bool _nodeIsMultiplayer;
     bool _nodeIsAiAircraft;
@@ -109,6 +112,7 @@ private:
     bool _last_wish;
 
     SGPropertyNode_ptr _node;
+    simgear::TiedPropertyList _tiedProperties;
 };
 
 }; // namespace yasim