Sync. w. JSBSim CVS

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

diff --git a/src/MultiPlayer/multiplaymgr.cxx b/src/MultiPlayer/multiplaymgr.cxx
index 855969238e148d1b30777e3ab1defe7b291e3060..ca5a1753f79db8eff7561f5e7bea3be235406717 100644 (file)
--- a/src/MultiPlayer/multiplaymgr.cxx
+++ b/src/MultiPlayer/multiplaymgr.cxx
@@ -158,6 +158,8 @@ const FGMultiplayMgr::sIdPropertyList[] = {
   {1100, "sim/model/variant", SGPropertyNode::INT},
   {1101, "sim/model/livery/file", SGPropertyNode::STRING},
 
+  {1200, "environment/wildfire/data", SGPropertyNode::STRING},
+
   {10001, "sim/multiplay/transmission-freq-hz",  SGPropertyNode::STRING},
   {10002, "sim/multiplay/chat",  SGPropertyNode::STRING},
 
@@ -710,9 +712,7 @@ FGMultiplayMgr::Update(void)
     return;
 
   /// Just for expiry
-  SGTimeStamp timestamper;
-  timestamper.stamp();
-  long stamp = timestamper.get_seconds();
+  long stamp = SGTimeStamp::now().getSeconds();
 
   //////////////////////////////////////////////////
   //  Read the receive socket and process any data
@@ -929,7 +929,7 @@ FGMultiplayMgr::ProcessPosMsg(const FGMultiplayMgr::MsgBuf& Msg,
 
         default:
           pData->float_value = XDR_decode_float(*xdr);
-          cerr << "Unknown Prop type " << pData->id << " " << pData->type << "\n";
+          SG_LOG(SG_NETWORK, SG_ALERT, "Unknown Prop type " << pData->id << " " << pData->type);
           xdr++;
           break;
       }            
@@ -978,7 +978,7 @@ FGMultiplayMgr::ProcessChatMsg(const MsgBuf& Msg,
   
   const T_ChatMsg* ChatMsg
       = reinterpret_cast<const T_ChatMsg *>(Msg.Msg + sizeof(T_MsgHdr));
-  SG_LOG (SG_NETWORK, SG_ALERT, "Chat [" << MsgHdr->Callsign << "]"
+  SG_LOG (SG_NETWORK, SG_WARN, "Chat [" << MsgHdr->Callsign << "]"
            << " " << chatStr);
 
   delete [] chatStr;