Changeset 9320 for code/branches/presentation2012merge/src/modules/pickup

Timestamp:

Jul 21, 2012, 3:51:06 PM (12 years ago)

Author:

landauf

Message:

removed Pickupable::clone() because it is not needed anymore

Location:

code/branches/presentation2012merge/src/modules/pickup

Files:

• Pickup.cc (modified) (1 diff)
• Pickup.h (modified) (1 diff)
• PickupCollection.cc (modified) (1 diff)
• PickupCollection.h (modified) (1 diff)
• items/DamageBoostPickup.cc (modified) (1 diff)
• items/DamageBoostPickup.h (modified) (1 diff)
• items/DronePickup.cc (modified) (1 diff)
• items/DronePickup.h (modified) (1 diff)
• items/HealthPickup.cc (modified) (1 diff)
• items/HealthPickup.h (modified) (1 diff)
• items/InvisiblePickup.cc (modified) (1 diff)
• items/InvisiblePickup.h (modified) (1 diff)
• items/MetaPickup.cc (modified) (1 diff)
• items/MetaPickup.h (modified) (1 diff)
• items/ShieldPickup.cc (modified) (1 diff)
• items/ShieldPickup.h (modified) (1 diff)
• items/ShrinkPickup.cc (modified) (1 diff)
• items/ShrinkPickup.h (modified) (1 diff)
• items/SpeedPickup.cc (modified) (1 diff)
• items/SpeedPickup.h (modified) (1 diff)

code/branches/presentation2012merge/src/modules/pickup/Pickup.cc

@@ -181 +181 @@
     /**
     @brief
-        Creates a duplicate of the OrxonoxClass.
-    @param item
-        A reference to the pointer of the item that we're duplicating.
-    */
-    void Pickup::clone(OrxonoxClass*& item)
-    {
-        if(item == NULL)
-            item = new Pickup(this);
-
-        SUPER(Pickup, clone, item);
-
-        Pickup* pickup = orxonox_cast<Pickup*>(item);
-        pickup->setRepresentationName(this->getRepresentationName());
-        pickup->setActivationType(this->getActivationType());
-        pickup->setDurationType(this->getDurationType());
-    }
-
-    /**
-    @brief
         Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
     @return

code/branches/presentation2012merge/src/modules/pickup/Pickup.h

@@ -150 +150 @@
 
             virtual void changedPickedUp(void); //!< Should be called when the pickup has transited from picked up to dropped or the other way around.
-            virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the OrxonoxClass.
 
         protected:

code/branches/presentation2012merge/src/modules/pickup/PickupCollection.cc

@@ -196 +196 @@
         if(!isOnePickupEnabledAndPickedUp && this->isPickedUp())
             this->Pickupable::destroy();
-    }
-
-    /**
-    @brief
-        Creates a duplicate of the input Pickupable.
-        This method needs to be implemented by any Class inheriting from Pickupable.
-    @param item
-        A reference to a pointer to the OrxonoxClass that is to be duplicated.
-    */
-    void PickupCollection::clone(OrxonoxClass*& item)
-    {
-        if(item == NULL)
-            item = new PickupCollection(this);
-
-        SUPER(PickupCollection, clone, item);
-
-        PickupCollection* pickup = orxonox_cast<PickupCollection*>(item);
-        pickup->setRepresentationName(this->getRepresentationName());
-        // Clone all Pickupables this PickupCollection consist of.
-        for(std::list<CollectiblePickup*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); ++it)
-        {
-            Pickupable* newPickup = (*it)->clone();
-            CollectiblePickup* collectible = static_cast<CollectiblePickup*>(newPickup);
-            pickup->addPickupable(collectible);
-        }
     }
 

code/branches/presentation2012merge/src/modules/pickup/PickupCollection.h

@@ -79 +79 @@
             virtual void changedPickedUp(void); //!< Is called when the pickup has transited from picked up to dropped or the other way around.
 
-            virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input pickup.
-
             virtual bool isTarget(const PickupCarrier* carrier) const; //!< Get whether a given class, represented by the input Identifier, is a target of this PickupCollection.
 

code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.cc

@@ -169 +169 @@
     /**
     @brief
-        Creates a duplicate of the input OrxonoxClass.
-    @param item
-        A pointer to the Orxonox class.
-    */
-    void DamageBoostPickup::clone(OrxonoxClass*& item)
-    {
-        if(item == NULL)
-            item = new DamageBoostPickup(this);
-
-        SUPER(DamageBoostPickup, clone, item);
-
-        DamageBoostPickup* pickup = orxonox_cast<DamageBoostPickup*>(item);
-        pickup->setDuration(this->getDuration());
-        pickup->setDamageMultiplier(this->getDamageMultiplier());
-    }
-
-    /**
-    @brief
         Sets the duration for which the DamageBoostPickup stays active.
     @param duration

code/branches/presentation2012merge/src/modules/pickup/items/DamageBoostPickup.h

@@ -55 +55 @@
 
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
-            virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
 
             /**

code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.cc

@@ -170 +170 @@
         return pawn;
     }
-
-    /**
-    @brief
-        Creates a duplicate of the input OrxonoxClass.
-    @param item
-        A pointer to the Orxonox class.
-    */
-    void DronePickup::clone(OrxonoxClass*& item)
-    {
-        if(item == NULL)
-            item = new DronePickup(this);
-
-        SUPER(DronePickup, clone, item);
-
-        DronePickup* pickup = orxonox_cast<DronePickup*>(item);
-        pickup->setDroneTemplate(this->getDroneTemplate());
-    }
 }

code/branches/presentation2012merge/src/modules/pickup/items/DronePickup.h

@@ -70 +70 @@
 
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
-            virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
 
             const std::string& getDroneTemplate() const; //!< Get the name of the droneTemplate.

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

@@ -248 +248 @@
     /**
     @brief
-        Creates a duplicate of the input OrxonoxClass.
-    @param item
-        A pointer to the Orxonox class.
-    */
-    void HealthPickup::clone(OrxonoxClass*& item)
-    {
-        if(item == NULL)
-            item = new HealthPickup(this);
-
-        SUPER(HealthPickup, clone, item);
-
-        HealthPickup* pickup = orxonox_cast<HealthPickup*>(item);
-        pickup->setHealth(this->getHealth());
-        pickup->setHealthRate(this->getHealthRate());
-        pickup->setHealthType(this->getHealthType());
-    }
-
-    /**
-    @brief
         Get the health type of this pickup.
     @return

code/branches/presentation2012merge/src/modules/pickup/items/HealthPickup.h

@@ -97 +97 @@
 
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
-            virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
 
             /**

code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc

@@ -132 +132 @@
     /**
     @brief
-        Creates a duplicate of the input OrxonoxClass.
-    @param item
-        A pointer to the Orxonox class.
-    */
-    void InvisiblePickup::clone(OrxonoxClass*& item)
-    {
-        if(item == NULL)
-            item = new InvisiblePickup(this);
-
-        SUPER(InvisiblePickup, clone, item);
-
-        InvisiblePickup* pickup = orxonox_cast<InvisiblePickup*>(item);
-        pickup->setDuration(this->getDuration());
-    }
-
-    /**
-    @brief
         Sets the invisibility.
     @param invisibility

code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.h

@@ -75 +75 @@
             virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a HealthPickup object through XML.
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
-            virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
 
             /**

code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.cc

@@ -147 +147 @@
     /**
     @brief
-        Creates a duplicate of the input OrxonoxClass.
-    @param item
-        A pointer to the Orxonox class.
-    */
-    void MetaPickup::clone(OrxonoxClass*& item)
-    {
-        if(item == NULL)
-            item = new MetaPickup(this);
-
-        SUPER(MetaPickup, clone, item);
-
-        MetaPickup* pickup = orxonox_cast<MetaPickup*>(item);
-        pickup->setMetaType(this->getMetaType());
-    }
-
-    /**
-    @brief
         Get the meta type of this MetaPickup.
     @return

code/branches/presentation2012merge/src/modules/pickup/items/MetaPickup.h

@@ -95 +95 @@
 
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
-            virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
 
             /**

code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.cc

@@ -159 +159 @@
     /**
     @brief
-        Creates a duplicate of the input OrxonoxClass.
-    @param item
-        A pointer to the Orxonox class.
-    */
-    void ShieldPickup::clone(OrxonoxClass*& item)
-    {
-        if(item == NULL)
-            item = new ShieldPickup(this);
-
-        SUPER(ShieldPickup, clone, item);
-
-        ShieldPickup* pickup = orxonox_cast<ShieldPickup*>(item);
-        pickup->setDuration(this->getDuration());
-        pickup->setShieldAbsorption(this->getShieldAbsorption());
-        pickup->setShieldHealth(this->getShieldHealth());
-    }
-
-    /**
-    @brief
         Sets the duration.
     @param duration

code/branches/presentation2012merge/src/modules/pickup/items/ShieldPickup.h

@@ -82 +82 @@
 
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
-            virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
 
             /**

code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.cc

@@ -294 +294 @@
         return pawn;
     }
-
-    /**
-    @brief
-        Creates a duplicate of the input OrxonoxClass.
-    @param item
-        A pointer to the Orxonox class.
-    */
-    void ShrinkPickup::clone(OrxonoxClass*& item)
-    {
-        if(item == NULL)
-            item = new ShrinkPickup(this);
-
-        SUPER(ShrinkPickup, clone, item);
-        ShrinkPickup* pickup = orxonox_cast<ShrinkPickup*>(item);
-        pickup->setShrinkFactor(this->getShrinkFactor());
-        pickup->setDuration(this->getDuration());
-        pickup->setShrinkDuration(this->getShrinkDuration());
-    }
 }

code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.h

@@ -80 +80 @@
             virtual void changedUsed(void); // Is called when the pickup has transited from used to unused or the other way around.
             virtual void changedPickedUp(void);
-            virtual void clone(OrxonoxClass*& item); // Creates a duplicate of the input OrxonoxClass.
 
             /**

code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.cc

@@ -160 +160 @@
     /**
     @brief
-        Creates a duplicate of the input OrxonoxClass.
-    @param item
-        A pointer to the Orxonox class.
-    */
-    void SpeedPickup::clone(OrxonoxClass*& item)
-    {
-        if(item == NULL)
-            item = new SpeedPickup(this);
-
-        SUPER(SpeedPickup, clone, item);
-
-        SpeedPickup* pickup = orxonox_cast<SpeedPickup*>(item);
-        pickup->setDuration(this->getDuration());
-        pickup->setSpeedAdd(this->getSpeedAdd());
-        pickup->setSpeedMultiply(this->getSpeedMultiply());
-    }
-
-    /**
-    @brief
         Sets the duration for which the SpeedPickup stays active.
     @param duration

code/branches/presentation2012merge/src/modules/pickup/items/SpeedPickup.h

@@ -81 +81 @@
 
             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
-            virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
 
             /**