- don't abort if remote model isn't installed; output missing model's

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

diff --git a/src/MultiPlayer/multiplaytxmgr.cxx b/src/MultiPlayer/multiplaytxmgr.cxx
index 8a8256b2338eb4383f10a38f2010dad721c0cc12..ff7079a803f1efd9d74d5a3bb88d83129f00c4ef 100644 (file)
--- a/src/MultiPlayer/multiplaytxmgr.cxx
+++ b/src/MultiPlayer/multiplaytxmgr.cxx
@@ -21,6 +21,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef FG_MPLAYER_AS
+
 /******************************************************************
 * $Id$
 *
@@ -30,12 +36,18 @@
 *
 ******************************************************************/
 
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#include <sys/types.h>
+#if !(defined(_MSC_VER) || defined(__MINGW32__))
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <arpa/inet.h>
+#endif
 #include <plib/netSocket.h>
 #include <stdlib.h>
+
+#include <simgear/debug/logstream.hxx>
 #include <Main/fg_props.hxx>
+
 #include "multiplaytxmgr.hxx"
 #include "mpmessages.hxx"
 #include "mpplayer.hxx"
@@ -52,7 +64,7 @@ const char sMULTIPLAYTXMGR_HID[] = MULTIPLAYTXMGR_HID;
 ******************************************************************/
 FGMultiplayTxMgr::FGMultiplayTxMgr() {
 
-    int iPlayerCnt;         // Count of players in player array
+    // int iPlayerCnt;         // Count of players in player array
 
     // Initialise private members
     m_bInitialised = false;
@@ -91,8 +103,10 @@ bool FGMultiplayTxMgr::init(void) {
         string sTxAddress = fgGetString("/sim/multiplay/txhost");
         iTxPort = fgGetInt("/sim/multiplay/txport");
 
-        cout << "FGMultiplayTxMgr::init - txaddress= " << sTxAddress << endl;
-        cout << "FGMultiplayTxMgr::init - txport= " << iTxPort << endl;
+        SG_LOG( SG_NETWORK, SG_INFO, "FGMultiplayTxMgr::init - txaddress= "
+                                     << sTxAddress );
+        SG_LOG( SG_NETWORK, SG_INFO, "FGMultiplayTxMgr::init - txport= "
+                                     << iTxPort );
         
         if (iTxPort > 0) {
 
@@ -101,13 +115,13 @@ bool FGMultiplayTxMgr::init(void) {
             mDataTxSocket = new netSocket();
             if (!mDataTxSocket->open(false)) {
                 // Failed to open tx socket
-                cerr << "FGMultiplayTxMgr::init - Failed to create data transmit socket" << endl;
+                SG_LOG( SG_NETWORK, SG_ALERT, "FGMultiplayTxMgr::init - Failed to create data transmit socket" );
                 bSuccess = false;
             } else {
                 mDataTxSocket->setBroadcast(true);
                 if (mDataTxSocket->connect(sTxAddress.c_str(), iTxPort) != 0) {
                     // Failed to connect tx socket
-                    cerr << "FGMultiplayTxMgr::init - Failed to connect data transmit socket" << endl;
+                    SG_LOG( SG_NETWORK, SG_ALERT, "FGMultiplayTxMgr::init - Failed to connect data transmit socket" );
                     bSuccess = false;
                 }
             }
@@ -115,9 +129,9 @@ bool FGMultiplayTxMgr::init(void) {
             // Create a player object for the local player
             if (bSuccess) {
                 mLocalPlayer = new MPPlayer();
-                if (!mLocalPlayer->Open(fgGetString("/sim/multiplay/rxaddress"), fgGetInt("/sim/multiplay/rxport"),
+                if (!mLocalPlayer->Open(fgGetString("/sim/multiplay/rxhost"), fgGetInt("/sim/multiplay/rxport"),
                                         fgGetString("/sim/multiplay/callsign"), fgGetString("/sim/model/path"), true)) {
-                    cerr << "FGMultiplayTxMgr::init - Failed to create player object for local player" << endl;
+                    SG_LOG( SG_NETWORK, SG_ALERT, "FGMultiplayTxMgr::init - Failed to create player object for local player" );
                     bSuccess = false;
                 }
             }
@@ -125,7 +139,7 @@ bool FGMultiplayTxMgr::init(void) {
         // If Tx port == zero then don't initialise
         } else {
 
-            cout << "FGMultiplayTxMgr::init - Tx Port is zero. Multiplay out disabled." << endl;
+            SG_LOG( SG_NETWORK, SG_INFO, "FGMultiplayTxMgr::init - Tx Port is zero. Multiplay out disabled." );
             bSuccess = false;
 
         }
@@ -134,7 +148,7 @@ bool FGMultiplayTxMgr::init(void) {
         m_bInitialised = bSuccess;
 
     } else {
-        cerr << "FGMultiplayTxMgr::init - Attempt to init object that is already opened" << endl;
+        SG_LOG( SG_NETWORK, SG_WARN, "FGMultiplayTxMgr::init - Attempt to init object that is already opened" );
         bSuccess = false;
     }
 
@@ -202,10 +216,10 @@ void FGMultiplayTxMgr::SendMyPosition(const sgMat4 PlayerPosMat4) {
 ******************************************************************/
 void FGMultiplayTxMgr::SendTextMessage(const string &sMsgText) const {
 
-    bool bResult = false;
+    // bool bResult = false;
     T_MsgHdr MsgHdr;
     T_ChatMsg ChatMsg;
-    int iNextBlockPosition = 0;
+    unsigned int iNextBlockPosition = 0;
     char sMsg[sizeof(T_MsgHdr) + sizeof(T_ChatMsg)];
 
     if (m_bInitialised) {
@@ -227,3 +241,5 @@ void FGMultiplayTxMgr::SendTextMessage(const string &sMsgText) const {
 
 }
 
+#endif // FG_MPLAYER_AS
+