Changeset 1534 for code/trunk/src/orxonox/Orxonox.cc

Timestamp:

Jun 4, 2008, 8:53:10 PM (16 years ago)

Author:

rgrieder

Message:

merged network branch back to trunk

File:

• code/trunk/src/orxonox/Orxonox.cc (modified) (2 diffs)

code/trunk/src/orxonox/Orxonox.cc

@@ -127 +127 @@
       network::Client::destroySingleton();
     if (server_g)
-      delete server_g;
+      delete network::Server::getSingleton();
   }
 
@@ -303 +303 @@
     COUT(2) << "Loading level in server mode" << std::endl;
 
-    server_g = new network::Server(serverPort_);
+    //server_g = new network::Server(serverPort_);
+    server_g = network::Server::createSingleton(serverPort_);
 
     if (!loadScene())