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

Timestamp:

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

Author:

dafrick

Message:

More bug fixes.

Location:

code/branches/pickup3/src/orxonox

Files:

• interfaces/Pickupable.cc (modified) (2 diffs)
• pickup/PickupIdentifier.cc (modified) (1 diff)

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);

code/branches/pickup3/src/orxonox/pickup/PickupIdentifier.cc

@@ -111 +111 @@
     bool PickupIdentifier::addParameter(std::string & name, std::string & value)
     {
+        COUT(1) << "PickupIdentifier " << name << ", " << value << std::endl;
+        
         if(!(this->parameters_.find(name) == this->parameters_.end()))
         {
-            COUT(2) << "Request for adding a parameter that already exists for the PickupIdentififer was denied." << std::endl;
+            COUT(2) << "Request for adding a parameter that already exists for the PickupIdentififer was denied. name: '" << name << "', value: '" << value << "'."<<  std::endl;
             return false;
         }