Changeset 1669 for code/branches/network/src/orxonox/Orxonox.cc
- Timestamp:
- Aug 26, 2008, 1:19:21 AM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/network/src/orxonox/Orxonox.cc
r1577 r1669 126 126 GraphicsEngine::getSingleton().destroy(); 127 127 128 if ( network::Client::getSingleton())129 network::Client::destroySingleton();128 if (client_g) 129 delete client_g; 130 130 if (server_g) 131 delete network::Server::getSingleton();131 delete server_g; 132 132 } 133 133 … … 346 346 COUT(0) << "Loading level in server mode" << std::endl; 347 347 348 //server_g = new network::Server(serverPort_); 349 server_g = network::Server::createSingleton(serverPort_); 350 348 server_g = new network::Server(serverPort_); 349 COUT(0) << "Loading scene in server mode" << std::endl; 351 350 if (!loadScene()) 352 351 return false; … … 365 364 366 365 if (serverIp_.compare("") == 0) 367 client_g = ne twork::Client::createSingleton();366 client_g = new network::Client(); 368 367 else 369 368 370 client_g = ne twork::Client::createSingleton(serverIp_, serverPort_);369 client_g = new network::Client(serverIp_, serverPort_); 371 370 372 371 if(!client_g->establishConnection()) … … 509 508 510 509 if (mode_ == CLIENT) 511 network::Client::getSingleton()->closeConnection();510 client_g->closeConnection(); 512 511 else if (mode_ == SERVER) 513 512 server_g->close();
Note: See TracChangeset
for help on using the changeset viewer.