Changeset 7634 for code/branches/masterserver/src/libraries/network/Server.h

Timestamp:

Nov 10, 2010, 4:22:58 PM (14 years ago)

Author:

smerkli

Message:

 

File:

• code/branches/masterserver/src/libraries/network/Server.h (modified) (3 diffs)

code/branches/masterserver/src/libraries/network/Server.h

@@ -38 +38 @@
 #include "ServerConnection.h"
 #include "LANDiscoverable.h"
+#include "MasterServerComm.h"
+
+/* proto (move to central point soon) */ 
+#define MS_ADDRESS "localhost"
 
 namespace orxonox
@@ -53 +57 @@
     ~Server();
 
+    void helper_ConnectToMasterserver();
     void open();
     void close();
@@ -82 +87 @@
 
     float timeSinceLastUpdate_;
+    MasterServerComm msc;
   };