Changeset 1284 for code/branches/merge/src
- Timestamp:
- May 15, 2008, 2:55:13 PM (16 years ago)
- Location:
- code/branches/merge/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/merge/src/network/Client.cc
r1264 r1284 234 234 if(gs){ 235 235 COUT(4) << "client tick: sending gs " << gs << std::endl; 236 if(client_connection.addPacket(pck_gen.gstate(gs))) 236 ENetPacket *packet = pck_gen.gstate(gs); 237 if( packet == NULL || !client_connection.addPacket(packet)) 237 238 COUT(3) << "Problem adding partial gamestate to queue" << std::endl; 238 239 // now delete it to save memory -
code/branches/merge/src/orxonox/objects/SpaceShip.cc
r1275 r1284 116 116 if (this->tt_) 117 117 delete this->tt_; 118 if(setMouseEventCallback_) 119 InputManager::removeMouseHandler("SpaceShip"); 118 120 } 119 121 … … 142 144 void SpaceShip::init() 143 145 { 144 if (( !network::Client::getSingleton() || network::Client::getSingleton()->getShipID()==objectID))146 if ((server_ || ( network::Client::getSingleton() && network::Client::getSingleton()->getShipID()==objectID ) )) 145 147 { 146 148 if (!setMouseEventCallback_)
Note: See TracChangeset
for help on using the changeset viewer.