Changeset 6478

Timestamp:

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

Author:

dafrick

Message:

More bug fixes.

Location:

code/branches/pickup3/src

Files:

• modules/pickup/PickupRepresentation.cc (modified) (3 diffs)
• modules/pickup/PickupSpawner.cc (modified) (1 diff)
• modules/pickup/items/HealthPickup.cc (modified) (2 diffs)
• orxonox/interfaces/Pickupable.cc (modified) (2 diffs)
• orxonox/pickup/PickupIdentifier.cc (modified) (1 diff)

code/branches/pickup3/src/modules/pickup/PickupRepresentation.cc

@@ -46 +46 @@
     PickupRepresentation::PickupRepresentation() : BaseObject(this)
     {
+        this->spawnerRepresentation_ = NULL;
+        
         RegisterObject(PickupRepresentation);
         
@@ -57 +59 @@
     PickupRepresentation::PickupRepresentation(BaseObject* creator) : BaseObject(creator)
     {
+        this->spawnerRepresentation_ = NULL;
+        
         RegisterObject(PickupRepresentation);
         
@@ -81 +85 @@
         this->name_ = "Pickup";
         this->spawnerTemplate_ = "";
-        this->spawnerRepresentation_ = NULL;
         this->pickup_ = NULL;
     }

code/branches/pickup3/src/modules/pickup/PickupSpawner.cc

@@ -118 +118 @@
     {
         if(this->pickup_ != NULL)
-            delete this->pickup_;
+            this->pickup_->destroy();
     }
 

code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc

@@ -80 +80 @@
         this->maxHealthSave_ = 0;
         this->maxHealthOverwrite_ = 0;
-        
     }
     
@@ -123 +122 @@
         if(!this->isContinuous())
             this->healthRate_ = 0.0;
+        
+        COUT(1) << "HealthPickup " << this->getHealth() << ", " << this->getHealthRate() << ", " << this->getHealthType() << "." << std::endl;
         
         this->initializeIdentifier();

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