Changeset 7727 for code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.cc

Timestamp:

Dec 8, 2010, 1:49:39 PM (13 years ago)

Author:

smerkli

Message:

Before conversion of masterserver from module to library

File:

• code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.cc (copied) (copied from code/branches/masterserver/src/orxonox/gamestates/GSServer.cc) (5 diffs)

code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Reto Grieder
+ *      Sandro 'smerkli' Merkli 
  *   Co-authors:
- *      Fabian 'x3n' Landau
+ *      Reto Grieder (original file for GSServer.cc)
+ *      Fabian 'x3n' Landau (original file for GSServer.cc)
  *
  */
 
-#include "GSServer.h"
+#include "GSMasterServer.h"
 
 #include "util/Debug.h"
@@ -37 +38 @@
 namespace orxonox
 {
-    DeclareGameState(GSServer, "server", false, false);
+    DeclareGameState(GSMasterServer, "masterserver", false, false);
 
-    SetCommandLineArgument(port, 55556).shortcut("p").information("Network communication port to be used 0-65535 (default: 55556)");
+    SetCommandLineArgument(port, 55566).shortcut("p").information("Network communication port to be used 0-65535 (default: 55566)");
 
-    GSServer::GSServer(const GameStateInfo& info)
+    GSMasterServer::GSMasterServer(const GameStateInfo& info)
         : GameState(info)
         , server_(0)
@@ -47 +48 @@
     }
 
-    GSServer::~GSServer()
+    GSMasterServer::~GSMasterServer()
     {
     }
 
-    void GSServer::activate()
+    void GSMasterServer::activate()
     {
         GameMode::setIsServer(true);
@@ -61 +62 @@
     }
 
-    void GSServer::deactivate()
+    void GSMasterServer::deactivate()
     {
         this->server_->close();
@@ -69 +70 @@
     }
 
-    void GSServer::update(const Clock& time)
+    void GSMasterServer::update(const Clock& time)
     {
         server_->update(time);