Changeset 6516 for code/branches

Timestamp:

Mar 11, 2010, 10:59:37 PM (15 years ago)

Author:

dafrick

Message:

Resolved DroppedPickup bug, where the pickup picked up from a DroppedPickup was destroyed almost immediately after beign picked up, because the DroppedPickup was destroyed, and destroyed the pickup in its constructor.

Location:

code/branches/pickup3/src/modules/pickup

Files:

• DroppedPickup.cc (modified) (3 diffs)
• DroppedPickup.h (modified) (1 diff)
• PickupRepresentation.cc (modified) (1 diff)

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

@@ -51 +51 @@
         RegisterObject(DroppedPickup);
         
-        this->initialize();
     }
 
@@ -69 +68 @@
     {   
         RegisterObject(DroppedPickup);
-        
-        this->initialize();
-        
+
         this->setPosition(position);
         this->setActive(false);
@@ -83 +80 @@
     DroppedPickup::~DroppedPickup()
     {
-        if(this->gotPickedUp_ && this->pickup_ != NULL)
+        if(this->pickup_ != NULL && this->pickup_->isPickedUp())
         {
             this->pickup_ = NULL;
         }
-    }
-    
-    /**
-    @brief
-        Initializes the member variables of the object.
-    */
-    void DroppedPickup::initialize(void)
-    {
-        this->gotPickedUp_ = false;
     }
 

code/branches/pickup3/src/modules/pickup/DroppedPickup.h

@@ -58 +58 @@
         protected:
             virtual Pickupable* getPickup(void); //!< Creates the Pickupable that is going to get picked up.
-            
-        private:
-            void initialize(void); //!< Initializes the member variables of the object.
-            
-            bool gotPickedUp_; //!< Whether the pickup got picked up or not.
 
     };

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

@@ -44 +44 @@
         This is primarily for use of the PickupManager in creating a default PickupRepresentation.
     */
+    //TODO: Not this as creator!!!
     PickupRepresentation::PickupRepresentation() : BaseObject(this)
     {