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

Timestamp:

Jul 18, 2012, 10:36:24 PM (13 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/HealthPickup.cc (modified) (4 diffs)

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

@@ -38 +38 @@
 #include "core/XMLPort.h"
 
-#include "pickup/PickupIdentifier.h"
 #include "worldentities/pawns/Pawn.h"
 
@@ -87 +86 @@
     /**
     @brief
-        Initializes the PickupIdentifier of this pickup.
-    */
-    void HealthPickup::initializeIdentifier(void)
-    {
-        this->pickupIdentifier_->addParameter("health", this->getHealth());
-        this->pickupIdentifier_->addParameter("healthType", this->getHealthType());
-        this->pickupIdentifier_->addParameter("healthRate", this->getHealthRate());
-    }
-
-    /**
-    @brief
         Method for creating a HealthPickup object through XML.
     */
@@ -110 +98 @@
         if(!this->isContinuous())
             this->setHealthRate(0.0f); // TODO: this logic should be inside tick(), not in XMLPort
-
-        this->initializeIdentifier();
     }
 
@@ -277 +263 @@
         pickup->setHealthRate(this->getHealthRate());
         pickup->setHealthType(this->getHealthType());
-
-        pickup->initializeIdentifier();
     }