Changeset 1184 for code/branches/network3/src/orxonox/Orxonox.cc

Timestamp:

Apr 24, 2008, 11:00:30 PM (16 years ago)

Author:

scheusso

Message:

first success: client clones the servers universe and displays it with quite good performance

File:

• code/branches/network3/src/orxonox/Orxonox.cc (modified) (3 diffs)

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

@@ -184 +184 @@
     GraphicsEngine::getSingleton().destroy();
 
-    if (client_g)
-      delete client_g;
+    if (network::Client::getSingleton())
+      network::Client::destroySingleton();
     if (server_g)
       delete server_g;
@@ -281 +281 @@
     ogre_->setup();
     if(serverIp_.compare("")==0)
-      client_g = new network::Client();
+      client_g = network::Client::createSingleton();
     else
-      client_g = new network::Client(serverIp_, NETWORK_PORT);
+      client_g = network::Client::createSingleton(serverIp_, NETWORK_PORT);
     if(!ogre_->load(this->dataPath_)) abortImmediateForce(/* unable to load */);
   }
@@ -422 +422 @@
     ib->registerListener(console, &Testconsole::execute, '\n', 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);