X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMultiPlayer%2Fmultiplaymgr.hxx;h=96e56f2428a29f8e56f3313650be78b978029331;hb=ad13e4f3b42c53410cb695d2dd0083af77addb2e;hp=2cca356c571c575c12894fa02b3f00e3ada4acd3;hpb=8a756eee5404eefbe88d0899439366b50e491c2a;p=flightgear.git diff --git a/src/MultiPlayer/multiplaymgr.hxx b/src/MultiPlayer/multiplaymgr.hxx index 2cca356c5..96e56f242 100644 --- a/src/MultiPlayer/multiplaymgr.hxx +++ b/src/MultiPlayer/multiplaymgr.hxx @@ -58,7 +58,7 @@ public: struct IdPropertyList { unsigned id; const char* name; - SGPropertyNode::Type type; + simgear::props::Type type; }; static const IdPropertyList sIdPropertyList[]; static const unsigned numProperties; @@ -72,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 > MultiPlayerMap;