Changeset 8463 for code/trunk/src/orxonox

Timestamp:

May 12, 2011, 3:40:05 PM (14 years ago)

Author:

dafrick

Message:

Adjusting some debug output with the added bonus of no more Segfaults when picking up a pickup.

File:

• code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) (5 diffs)

code/trunk/src/orxonox/interfaces/Pickupable.cc

@@ -126 +126 @@
             return false;
 
-        COUT(4) << "Pickupable (" << this->getIdentifier()->getName() << ") (&" << this << ") set to used " << used << "." << std::endl;
+        COUT(4) << "Pickupable (&" << this << ") set to used " << used << "." << std::endl;
 
         this->used_ = used;
@@ -221 +221 @@
         if(!this->setCarrier(carrier))
         {
-            COUT(3) << "A Pickupable (" << this->getIdentifier()->getName() << ") (&" << this << ") was trying to be added to a PickupCarrier, but was already present." << std::endl;
+            COUT(3) << "A Pickupable (&" << this << ") was trying to be added to a PickupCarrier, but was already present." << std::endl;
             return false;
         }
 
         this->setPickedUp(true);
-        COUT(4) << "Pickupable (" << this->getIdentifier()->getName() << ") (&" << this << ") got picked up by a PickupCarrier (&" << carrier << ")." << std::endl;
+        COUT(4) << "Pickupable (&" << this << ") got picked up by a PickupCarrier (&" << carrier << ")." << std::endl;
         return true;
     }
@@ -247 +247 @@
             COUT(2) << "Pickupable (&" << this << ", " << this->getIdentifier()->getName() << ") is being dropped, but it was not present in the PickupCarriers list of pickups." << std::endl;
 
-        COUT(4) << "Pickupable (" << this->getIdentifier()->getName() << ") (&" << this << ") got dropped up by a PickupCarrier (&" << this->getCarrier() << ")." << std::endl;
+        COUT(4) << "Pickupable (&" << this << ") got dropped up by a PickupCarrier (&" << this->getCarrier() << ")." << std::endl;
         this->setUsed(false);
         this->setPickedUp(false);
@@ -276 +276 @@
             return false;
 
-        COUT(4) << "Pickupable (" << this->getIdentifier()->getName() << ") (&" << this << ") set to pickedUp " << pickedUp << "." << std::endl;
+        COUT(4) << "Pickupable (&" << this << ") set to pickedUp " << pickedUp << "." << std::endl;
 
         this->pickedUp_ = pickedUp;
@@ -305 +305 @@
             return false;
 
-        COUT(4) << "Pickupable (" << this->getIdentifier()->getName() << ") (&" << this << ") changed Carrier (& " << carrier << ")." << std::endl;
+        COUT(4) << "Pickupable (&" << this << ") changed Carrier (& " << carrier << ")." << std::endl;
 
         if(carrier != NULL && tell)