Changeset 6480 for code/branches/pickup3/src/modules/pickup

Timestamp:

Mar 7, 2010, 2:05:05 PM (15 years ago)

Author:

dafrick

Message:

Simplification in creation of PickupIdentifier.

Location:

code/branches/pickup3/src/modules/pickup

Files:

• Pickup.cc (modified) (1 diff)
• PickupCollection.cc (modified) (2 diffs)
• PickupCollectionIdentifier.cc (modified) (1 diff)
• PickupCollectionIdentifier.h (modified) (1 diff)
• items/HealthPickup.cc (modified) (1 diff)

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

@@ -72 +72 @@
     */
     void Pickup::initializeIdentifier(void)
-    {
-        //TODO: Check whether this could not be done in the Constructor if Pickupable. Would be much more convenient.
-        this->pickupIdentifier_->addClass(this->getIdentifier());
-        
+    {        
         //TODO: Works?
         std::string val1 = this->getActivationType();

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

@@ -53 +53 @@
         RegisterObject(PickupCollection);
         
-        this->pickupCollectionIdentifier_ = new PickupCollectionIdentifier();
+        this->pickupCollectionIdentifier_ = new PickupCollectionIdentifier(this);
     }
     
@@ -85 +85 @@
     void PickupCollection::initializeIdentifier(void)
     {
-        this->pickupCollectionIdentifier_->addClass(this->getIdentifier());
-        
         for(std::vector<Pickupable*>::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
         {

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

@@ -34 +34 @@
 {
     
-    PickupCollectionIdentifier::PickupCollectionIdentifier(void)
+    PickupCollectionIdentifier::PickupCollectionIdentifier(Pickupable* pickup) : PickupIdentifier(pickup)
     {
         RegisterObject(PickupCollectionIdentifier);

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

@@ -42 +42 @@
         
         public:
-            PickupCollectionIdentifier(void);
+            PickupCollectionIdentifier(Pickupable* pickup);
             ~PickupCollectionIdentifier();
             

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

@@ -88 +88 @@
     void HealthPickup::initializeIdentifier(void)
     {
-        this->pickupIdentifier_->addClass(this->getIdentifier());
-        
         std::stringstream stream;
         stream << this->getHealth();