Fix two bugs in the new autopilot code

[flightgear.git] / src / MultiPlayer / mpmessages.hxx

diff --git a/src/MultiPlayer/mpmessages.hxx b/src/MultiPlayer/mpmessages.hxx
index 12655a0cedd60bab97b5173d09dfdcf5ccce50ac..dded2b3e2175819b6fa1eef626e4f66b853c48ff 100644 (file)
--- a/src/MultiPlayer/mpmessages.hxx
+++ b/src/MultiPlayer/mpmessages.hxx
@@ -37,7 +37,6 @@
 
 #include <vector>
 
-#include <plib/sg.h>
 #include <simgear/compiler.h>
 #include <simgear/props/props.hxx>
 #include <simgear/math/SGMath.hxx>
@@ -108,13 +107,19 @@ struct T_PositionMsg {
     // angular acceleration wrt the earth centered frame measured in
     // the earth centered frame
     xdr_data_t angularAccel[3];
+    // Padding. The alignment is 8 bytes on x86_64 because there are
+    // 8-byte types in the message, so the size should be explicitly
+    // rounded out to a multiple of 8. Of course, it's a bad idea to
+    // put a C struct directly on the wire, but that's a fight for
+    // another day...
+    xdr_data_t pad;
 };
 
 struct FGPropertyData {
   unsigned id;
   
   // While the type isn't transmitted, it is needed for the destructor
-  SGPropertyNode::Type type;
+  simgear::props::Type type;
   union { 
     int int_value;
     float float_value;
@@ -122,7 +127,7 @@ struct FGPropertyData {
   }; 
   
   ~FGPropertyData() {
-    if ((type == SGPropertyNode::STRING) || (type == SGPropertyNode::UNSPECIFIED))
+    if ((type == simgear::props::STRING) || (type == simgear::props::UNSPECIFIED))
     {
       delete [] string_value;
     }