Fix for bug 1304 - crash loading XML route

[flightgear.git] / src / Network / generic.hxx

diff --git a/src/Network/generic.hxx b/src/Network/generic.hxx
index b3020a390273322af90da472026536ec476f0dd9..fbc146d5c2adfbec68b1cbb0bce1d6fe544c93ea 100644 (file)
--- a/src/Network/generic.hxx
+++ b/src/Network/generic.hxx
@@ -33,7 +33,6 @@
 
 using std::string;
 
-
 class FGGeneric : public FGProtocol {
 
 public:
@@ -60,7 +59,7 @@ public:
     bool getInitOk(void) { return initOk; }
 protected:
 
-    enum e_type { FG_BOOL=0, FG_INT, FG_FLOAT, FG_DOUBLE, FG_STRING, FG_FIXED };
+    enum e_type { FG_BOOL=0, FG_INT, FG_FLOAT, FG_DOUBLE, FG_STRING, FG_FIXED, FG_BYTE, FG_WORD };
 
     typedef struct {
      // string name;
@@ -101,9 +100,11 @@ private:
     bool gen_message_binary();
     bool parse_message_ascii(int length);
     bool parse_message_binary(int length);
-    void read_config(SGPropertyNode *root, vector<_serial_prot> &msg);
+    bool read_config(SGPropertyNode *root, vector<_serial_prot> &msg);
     bool exitOnError;
     bool initOk;
+
+    class FGProtocolWrapper * wrapper;
     
     template<class T>
     static void updateValue(_serial_prot& prot, const T& val)