Changeset 1284 for code/branches/merge/src

Timestamp:

May 15, 2008, 2:55:13 PM (17 years ago)

Author:

scheusso

Message:

spaceship fix

Location:

code/branches/merge/src

Files:

• network/Client.cc (modified) (1 diff)
• orxonox/objects/SpaceShip.cc (modified) (2 diffs)

code/branches/merge/src/network/Client.cc

@@ -234 +234 @@
       if(gs){
         COUT(4) << "client tick: sending gs " << gs << std::endl;
-        if(client_connection.addPacket(pck_gen.gstate(gs)))
+        ENetPacket *packet = pck_gen.gstate(gs);
+        if( packet == NULL || !client_connection.addPacket(packet))
           COUT(3) << "Problem adding partial gamestate to queue" << std::endl;
         // now delete it to save memory

code/branches/merge/src/orxonox/objects/SpaceShip.cc

@@ -116 +116 @@
         if (this->tt_)
             delete this->tt_;
+        if(setMouseEventCallback_)
+          InputManager::removeMouseHandler("SpaceShip");
     }
 
@@ -142 +144 @@
     void SpaceShip::init()
     {
-    if ((!network::Client::getSingleton() || network::Client::getSingleton()->getShipID()==objectID ))
+    if ((server_ || ( network::Client::getSingleton() && network::Client::getSingleton()->getShipID()==objectID ) ))
     {
           if (!setMouseEventCallback_)