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

Timestamp:

Nov 4, 2009, 12:28:59 PM (15 years ago)

Author:

rgrieder

Message:

Renamed CommandLine to CommandLineParse to avoid confusions with the class name.

Location:

code/trunk/src/orxonox/gamestates

Files:

• GSClient.cc (modified) (2 diffs)
• GSDedicated.cc (modified) (4 diffs)
• GSDedicatedClient.cc (modified) (4 diffs)
• GSServer.cc (modified) (2 diffs)

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

@@ -31 +31 @@
 #include "util/Clock.h"
 #include "util/Exception.h"
-#include "core/CommandLine.h"
+#include "core/CommandLineParser.h"
 #include "core/Game.h"
 #include "core/GameMode.h"
@@ -56 +56 @@
         GameMode::setIsClient(true);
 
-        this->client_ = new Client(CommandLine::getValue("ip").getString(), CommandLine::getValue("port"));
+        this->client_ = new Client(CommandLineParser::getValue("ip").getString(), CommandLineParser::getValue("port"));
 
         if(!client_->establishConnection())

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

@@ -36 +36 @@
 #include "util/Debug.h"
 #include "util/Sleep.h"
-#include "core/CommandLine.h"
+#include "core/CommandLineParse.h"
 #include "core/CommandExecutor.h"
 #include "core/Game.h"
@@ -81 +81 @@
 #endif
 
-        this->server_ = new Server(CommandLine::getValue("port"));
+        this->server_ = new Server(CommandLineParser::getValue("port"));
         COUT(0) << "Loading scene in server mode" << std::endl;
 
@@ -91 +91 @@
         this->server_->close();
         delete this->server_;
-        
+
         closeThread_ = true;
 #ifdef ORXONOX_PLATFORM_UNIX
@@ -138 +138 @@
                         escapeChar = 2;
                         continue;
-                    }
+}
                     else if ( escapeChar == 2 )
                     {

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

@@ -37 +37 @@
 #include "util/Exception.h"
 #include "util/Sleep.h"
-#include "core/CommandLine.h"
+#include "core/CommandLineParser.h"
 #include "core/CommandExecutor.h"
 #include "core/Game.h"
@@ -80 +80 @@
 #endif
 
-        this->client_ = new Client(CommandLine::getValue("ip").getString(), CommandLine::getValue("port"));
+        this->client_ = new Client(CommandLineParser::getValue("ip").getString(), CommandLine::getValue("port"));
         COUT(0) << "Loading scene in client mode" << std::endl;
 
@@ -93 +93 @@
     void GSDedicatedClient::deactivate()
     {
-        if( this->client_ )
+        if (this->client_)
         {
             this->client_->closeConnection();
             delete this->client_;
         }
-        
+
         closeThread_ = true;
 #ifdef ORXONOX_PLATFORM_UNIX
@@ -143 +143 @@
                         escapeChar = 2;
                         continue;
-                    }
+}
                     else if ( escapeChar == 2 )
                     {

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

@@ -30 +30 @@
 
 #include "util/Debug.h"
-#include "core/CommandLine.h"
+#include "core/CommandLineParser.h"
 #include "core/Game.h"
 #include "core/GameMode.h"
@@ -55 +55 @@
         GameMode::setHasServer(true);
 
-        this->server_ = new Server(CommandLine::getValue("port"));
+        this->server_ = new Server(CommandLineParser::getValue("port"));
         COUT(0) << "Loading scene in server mode" << std::endl;