Changeset 9318 for code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc

Timestamp:

Jul 18, 2012, 10:36:24 PM (12 years ago)

Author:

landauf

Message:

removed PickupIdentifier for a number of reasons (I talked to Damian about it before)
a pickup now references the PickupRepresentation by name with the "representation" attribute

File:

• code/branches/presentation2012merge/src/modules/pickup/items/InvisiblePickup.cc (modified) (4 diffs)

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

@@ -40 +40 @@
 #include "core/XMLPort.h"
 
-#include "pickup/PickupIdentifier.h"
 #include "worldentities/pawns/Pawn.h"
 
@@ -79 +78 @@
     /**
     @brief
-        Initializes the PickupIdentifier of this pickup.
-    */
-    void InvisiblePickup::initializeIdentifier(void)
-    {
-        this->pickupIdentifier_->addParameter("duration", this->getDuration());
-    }
-
-    /**
-    @brief
         Method for creating a HealthPickup object through XML.
     */
@@ -94 +84 @@
         SUPER(InvisiblePickup, XMLPort, xmlelement, mode);
         XMLPortParam(InvisiblePickup, "duration", setDuration, getDuration, xmlelement, mode);
-
-        this->initializeIdentifier();
     }
 
@@ -157 +145 @@
         InvisiblePickup* pickup = orxonox_cast<InvisiblePickup*>(item);
         pickup->setDuration(this->getDuration());
-        pickup->initializeIdentifier();
     }