Changeset 7548 for code/trunk/src/modules/pickup/items

Timestamp:

Oct 16, 2010, 1:22:15 PM (14 years ago)

Author:

dafrick

Message:

Resolving some TODO's.

Location:

code/trunk/src/modules/pickup/items

Files:

• DronePickup.cc (modified) (1 diff)
• HealthPickup.cc (modified) (1 diff)
• InvisiblePickup.cc (modified) (1 diff)
• MetaPickup.cc (modified) (1 diff)
• ShieldPickup.cc (modified) (1 diff)
• SpeedPickup.cc (modified) (1 diff)

code/trunk/src/modules/pickup/items/DronePickup.cc

@@ -130 +130 @@
     {
         SUPER(DronePickup, changedUsed);
-
-        // If the pickup is not picked up nothing must be done.
-        if(!this->isPickedUp())
-            return;
 
         // If the pickup has transited to used.

code/trunk/src/modules/pickup/items/HealthPickup.cc

@@ -187 +187 @@
     {
         SUPER(HealthPickup, changedUsed);
-
-        // If the pickup is not picked up nothing must be done.
-        if(!this->isPickedUp()) //TODO: Needed?
-            return;
 
         // If the pickup has transited to used.

code/trunk/src/modules/pickup/items/InvisiblePickup.cc

@@ -109 +109 @@
     {
         SUPER(InvisiblePickup, changedUsed);
-
-        // If the pickup is not picked up nothing must be done.
-        if(!this->isPickedUp())
-            return;
 
         // If the pickup has transited to used.

code/trunk/src/modules/pickup/items/MetaPickup.cc

@@ -126 +126 @@
                 if(this->getMetaTypeDirect() == pickupMetaType::destroyCarrier)
                 {
-                    this->Pickupable::destroy(); //TODO: Needed?
                     Pawn* pawn = orxonox_cast<Pawn*>(carrier);
                     pawn->kill();

code/trunk/src/modules/pickup/items/ShieldPickup.cc

@@ -126 +126 @@
     {
         SUPER(ShieldPickup, changedUsed);
-
-        // If the pickup is not picked up nothing must be done.
-        if(!this->isPickedUp())
-            return;
 
         Pawn* pawn = this->carrierToPawnHelper();

code/trunk/src/modules/pickup/items/SpeedPickup.cc

@@ -126 +126 @@
     {
         SUPER(SpeedPickup, changedUsed);
-
-        // If the pickup is not picked up nothing must be done.
-        if(!this->isPickedUp())
-            return;
 
         Engine* engine = this->carrierToEngineHelper();