Update Mac configure script for new ALUT scheme; support --with-alut-framework.

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

diff --git a/src/MultiPlayer/multiplaymgr.hxx b/src/MultiPlayer/multiplaymgr.hxx
index 45f1c740a79741dee9197f27c0a86591fce404b9..96e56f2428a29f8e56f3313650be78b978029331 100644 (file)
--- a/src/MultiPlayer/multiplaymgr.hxx
+++ b/src/MultiPlayer/multiplaymgr.hxx
@@ -38,9 +38,9 @@
 #endif
 
 #include <string>
-SG_USING_STD(string);
+using std::string;
 #include <vector>
-SG_USING_STD(vector);
+using std::vector;
 
 #include <simgear/compiler.h>
 #include <simgear/props/props.hxx>
@@ -58,10 +58,13 @@ public:
   struct IdPropertyList {
     unsigned id;
     const char* name;
-    SGPropertyNode::Type type;
+    simgear::props::Type type;
   };
-  static IdPropertyList sIdPropertyList[];
+  static const IdPropertyList sIdPropertyList[];
+  static const unsigned numProperties;
 
+  static const IdPropertyList* findProperty(unsigned id);
+  
   FGMultiplayMgr();
   ~FGMultiplayMgr();
   bool init(void);
@@ -69,18 +72,18 @@ public:
   // transmitter
   void SendMyPosition(const FGExternalMotionData& motionInfo);
   void SendTextMessage(const string &sMsgText);
-  void FillMsgHdr(T_MsgHdr *MsgHdr, int iMsgId, unsigned _len = 0u);
-  
   // receiver
-  void ProcessPosMsg(const char *Msg, netAddress & SenderAddress,
-                     unsigned len, long stamp);
-  void ProcessChatMsg(const char *Msg, netAddress & SenderAddress);
   void Update(void);
   
 private:
+  union MsgBuf;
   FGAIMultiplayer* addMultiplayer(const std::string& callsign,
                                   const std::string& modelName);
   FGAIMultiplayer* getMultiplayer(const std::string& callsign);
+  void FillMsgHdr(T_MsgHdr *MsgHdr, int iMsgId, unsigned _len = 0u);
+  void ProcessPosMsg(const MsgBuf& Msg, const netAddress& SenderAddress,
+                     long stamp);
+  void ProcessChatMsg(const MsgBuf& Msg, const netAddress& SenderAddress);
 
   /// maps from the callsign string to the FGAIMultiplayer
   typedef std::map<std::string, osg::ref_ptr<FGAIMultiplayer> > MultiPlayerMap;