Changeset 6478 for code/branches/pickup3/src/orxonox/interfaces

Timestamp:

Mar 7, 2010, 10:55:23 AM (15 years ago)

Author:

dafrick

Message:

More bug fixes.

File:

• code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc (modified) (2 diffs)

code/branches/pickup3/src/orxonox/interfaces/Pickupable.cc

@@ -48 +48 @@
     Pickupable::Pickupable()
     {
-        RegisterRootObject(Pickupable);
-
         this->used_ = false;
         this->pickedUp_ = false;
+        
+        RegisterRootObject(Pickupable);
+        
         this->carrier_ = NULL;
         
@@ -66 +67 @@
             this->setUsed(false);
         
-        if(this->isPickedUp())
+        if(this->isPickedUp() && this->getCarrier() != NULL)
         {
             this->getCarrier()->drop(this, false);