Changeset 7801 for code/trunk/src/orxonox/gamestates

Timestamp:

Dec 22, 2010, 7:24:24 PM (14 years ago)

Author:

dafrick

Message:

Merging presentation2 branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/gamestates/CMakeLists.txt (modified) (1 diff)
• src/orxonox/gamestates/GSMasterServer.cc (copied) (copied from code/branches/presentation/src/orxonox/gamestates/GSMasterServer.cc)
• src/orxonox/gamestates/GSMasterServer.h (copied) (copied from code/branches/presentation/src/orxonox/gamestates/GSMasterServer.h)
• src/orxonox/gamestates/GSServer.cc (modified) (2 diffs)

code/trunk/src/orxonox/gamestates/CMakeLists.txt

@@ -6 +6 @@
   GSRoot.cc
   GSServer.cc
+  GSMasterServer.cc
   GSStandalone.cc
 )

code/trunk/src/orxonox/gamestates/GSServer.cc

@@ -34 +34 @@
 #include "core/GameMode.h"
 #include "network/Server.h"
+#include "network/Connection.h"
 
 namespace orxonox
@@ -39 +40 @@
     DeclareGameState(GSServer, "server", false, false);
 
-    SetCommandLineArgument(port, 55556).shortcut("p").information("Network communication port to be used 0-65535 (default: 55556)");
+    SetCommandLineArgument(port, NETWORK_PORT).shortcut("p").information("Network communication port to be used 0-65535 (default: 55556)");
 
     GSServer::GSServer(const GameStateInfo& info)