Changeset 1767 for code/trunk/src/orxonox

Timestamp:

Sep 11, 2008, 2:31:14 PM (16 years ago)

Author:

scheusso

Message:

problems of the merge should be solved now (hopefully)

File:

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

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -77 +77 @@
       for(it = ObjectList<SpaceShip>::begin(); it; ++it){
         assert(it->isA(Class(SpaceShip)));
-        if( (it)->myShip_ || (network::Host::running() && network::Host::getShipID()==(it)->objectID) )
+        if( (it)->myShip_ || (network::Host::running() && network::Host::getShipID()==(it)->objectID) ){
+//        COUT(1) << "^^^^^^^^^^ myShip_:" << *it << " classname: " << (*it)->getIdentifier()->getName() << " objectid: " << (*it)->objectID << std::endl;
           return *it;
+        }
       }
-      return 0;
       return 0;
     }
@@ -167 +168 @@
       if(!myShip_){
         if(network::Host::running())
-          COUT(3) << "this id: " << this->objectID << " myShipID: " << network::Host::getShipID() << std::endl;
+//          COUT(3) << "this id: " << this->objectID << " myShipID: " << network::Host::getShipID() << std::endl;
         if(network::Host::running() && objectID == network::Host::getShipID()){
           if(!network::Host::isServer())