Changeset 1264 for code/branches/merge/src/orxonox/Orxonox.cc

Timestamp:

May 13, 2008, 5:01:10 PM (16 years ago)

Author:

scheusso

Message:

merge network3 and camera branch into merge branch

File:

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

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

@@ -189 +189 @@
     GraphicsEngine::getSingleton().destroy();
 
-    if (client_g)
-      delete client_g;
+    if (network::Client::getSingleton())
+      network::Client::destroySingleton();
     if (server_g)
       delete server_g;
   }
+
 
   /**
@@ -395 +396 @@
 
     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);
 
     client_g->establishConnection();
@@ -511 +512 @@
           }
 
+    if(mode_==CLIENT)
+      network::Client::getSingleton()->closeConnection();
+    else if(mode_==SERVER)
+      server_g->close();
     return true;
   }