Changeset 1379 for code/branches/network/src/orxonox/Orxonox.cc

Timestamp:

May 22, 2008, 4:35:11 PM (16 years ago)

Author:

scheusso

Message:

added command line argument —port

File:

• code/branches/network/src/orxonox/Orxonox.cc (modified) (6 diffs)

code/branches/network/src/orxonox/Orxonox.cc

@@ -170 +170 @@
     timefactor_(1.0f),
     mode_(STANDALONE),
-    serverIp_("")
+    serverIp_(""),
+    serverPort_(NETWORK_PORT)
   {
   }
@@ -244 +245 @@
     ar.checkArgument("data", dataPath, false);
     ar.checkArgument("ip", serverIp_, false);
+    ar.checkArgument("port", serverPort_, false);
     if(ar.errorHandling())
       return false;
@@ -357 +359 @@
     ib->registerListener(console, &Testconsole::execute, '\r', false);
     ib->registerListener(console, &Testconsole::hintandcomplete, '\t', true);
-    ib->registerListener(console, &Testconsole::clear, '§', true);
+    ib->registerListener(console, &Testconsole::clear, '�', true);
     ib->registerListener(console, &Testconsole::removeLast, '\b', true);
     ib->registerListener(console, &Testconsole::exit, (char)0x1B, true);
@@ -365 +367 @@
     ib->registerListener(orxonoxConsole_, &InGameConsole::execute, '\r', false);
     ib->registerListener(orxonoxConsole_, &InGameConsole::hintandcomplete, '\t', true);
-    ib->registerListener(orxonoxConsole_, &InGameConsole::clear, '§', true);
+    ib->registerListener(orxonoxConsole_, &InGameConsole::clear, '�', true);
     ib->registerListener(orxonoxConsole_, &InGameConsole::removeLast, '\b', true);
     ib->registerListener(orxonoxConsole_, &InGameConsole::exit, (char)0x1B, true);
@@ -379 +381 @@
     COUT(2) << "Loading level in server mode" << std::endl;
 
-    server_g = new network::Server();
+    server_g = new network::Server(serverPort_);
 
     if (!loadScene())
@@ -399 +401 @@
       client_g = network::Client::createSingleton();
     else
-      client_g = network::Client::createSingleton(serverIp_, NETWORK_PORT);
+      
+      client_g = network::Client::createSingleton(serverIp_, serverPort_);
 
     client_g->establishConnection();