[Orxonox-commit 3069] r7764 - code/branches/presentation/src/libraries/network

[smerkli at orxonox.net]

Author: smerkli
Date: 2010-12-15 14:56:28 +0100 (Wed, 15 Dec 2010)
New Revision: 7764

Modified:
   code/branches/presentation/src/libraries/network/Server.cc
   code/branches/presentation/src/libraries/network/Server.h
Log:
disconnect works now.

Modified: code/branches/presentation/src/libraries/network/Server.cc
===================================================================
--- code/branches/presentation/src/libraries/network/Server.cc	2010-12-15 13:51:39 UTC (rev 7763)
+++ code/branches/presentation/src/libraries/network/Server.cc	2010-12-15 13:56:28 UTC (rev 7764)
@@ -103,21 +103,6 @@
   /** helper that connects to the master server */
   void Server::helper_ConnectToMasterserver()
   {
-    //[> initialize it and see if it worked <]
-    //if( msc.initialize() )
-    //{ COUT(1) << "Error: could not initialize master server communications!\n";
-      //return;
-    //}
-
-    //[> connect and see if it worked <]
-    //if( msc.connect( WANDiscovery::getInstance().getMSAddress().c_str(), 
-      //ORX_MSERVER_PORT ) )
-    //{ COUT(1) << "Error: could not connect to master server!\n";
-      //return;
-    //}
-
-    /* now send the master server some note we're here */
-    //msc.sendRequest( MSPROTO_GAME_SERVER " " MSPROTO_REGISTER_SERVER );
     WANDiscovery::getInstance().msc.sendRequest( MSPROTO_GAME_SERVER " " 
       MSPROTO_REGISTER_SERVER );
   }

Modified: code/branches/presentation/src/libraries/network/Server.h
===================================================================
--- code/branches/presentation/src/libraries/network/Server.h	2010-12-15 13:51:39 UTC (rev 7763)
+++ code/branches/presentation/src/libraries/network/Server.h	2010-12-15 13:56:28 UTC (rev 7764)
@@ -89,7 +89,6 @@
     void syncClassid(unsigned int clientID);
 
     float timeSinceLastUpdate_;
-    //MasterServerComm msc;
   };