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

Timestamp:

Oct 13, 2010, 11:35:18 AM (14 years ago)

Author:

dafrick

Message:

Documenting in pickups module.
Cleaning up in PickupManager.
Removed some obsolete functions in HumanController and ControllableEntity, which were remenants of the old pickups module.
Fixed a bug.

Location:

code/trunk/src/modules/pickup/items

Files:

• MetaPickup.cc (modified) (1 diff)
• MetaPickup.h (modified) (1 diff)

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

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

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

@@ -108 +108 @@
             static const std::string metaTypeDestroyCarrier_s;
 
-
     };