Changeset 7727

Timestamp:

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

Author:

smerkli

Message:

Before conversion of masterserver from module to library

Location:

code/branches/masterserver/src/orxonox

Files:

• Main.cc (modified) (4 diffs)
• gamestates/GSMasterServer.cc (copied) (copied from code/branches/masterserver/src/orxonox/gamestates/GSServer.cc) (5 diffs)
• gamestates/GSMasterServer.h (copied) (copied from code/branches/masterserver/src/orxonox/gamestates/GSServer.h) (3 diffs)

code/branches/masterserver/src/orxonox/Main.cc

@@ -54 +54 @@
     SetCommandLineSwitch(dedicatedClient).information("Start in dedicated client mode");
 
+    /* ADD masterserver command */
+    SetCommandLineSwitch(masterserver).information("Start in masterserver mode");
+
     SetCommandLineArgument(generateDoc, "")
         .information("Generates a Doxygen file from things like SetConsoleCommand");
@@ -67 +70 @@
         if (CommandLineParser::getValue("generateDoc").getString().empty())
         {
+            /* TODO make this clear */
             game->setStateHierarchy(
             "root"
@@ -75 +79 @@
             " server,client"
             "  level"
+            " masterserver"
             );
 
@@ -90 +95 @@
             else if (CommandLineParser::getValue("dedicatedClient").getBool())
                 Game::getInstance().requestStates("client, level");
-            //else if (CommandLineParser::getValue("masterserver").getBool())
-                //Game::getInstance().requestStates("client, level");
+            /* ADD masterserver command */
+            else if (CommandLineParser::getValue("masterserver").getBool())
+                Game::getInstance().requestStates("masterserver");
             else
             {

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);

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

@@ -21 +21 @@
  *
  *   Author:
- *      Reto Grieder
+ *      Sandro 'smerkli' Merkli 
  *   Co-authors:
+ *      Reto Grieder (Original GSServer.h file this was adapted from)
  *      ...
  *
  */
 
-#ifndef _GSServer_H__
-#define _GSServer_H__
+#ifndef _GSMasterServer_H__
+#define _GSMasterServer_H__
 
 #include "OrxonoxPrereqs.h"
@@ -37 +38 @@
 namespace orxonox
 {
-    class _OrxonoxExport GSServer : public GameState
+    class _OrxonoxExport GSMasterServer : public GameState
     {
     public:
-        GSServer(const GameStateInfo& info);
-        ~GSServer();
+        GSMasterServer(const GameStateInfo& info);
+        ~GSMasterServer();
 
         void activate();
@@ -48 +49 @@
 
     private:
-        Server* server_;
+        
     };
 }