Changeset 6419 for code/branches/pickup3/src/orxonox/pickup/BaseItem.cc

Timestamp:

Dec 25, 2009, 11:07:09 PM (14 years ago)

Author:

rgrieder

Message:

Merged pickup2 into pickup3.

Location:

code/branches/pickup3

Files:

• . (modified) (1 prop)
• src/orxonox/pickup/BaseItem.cc (modified) (4 diffs)

code/branches/pickup3/src/orxonox/pickup/BaseItem.cc

@@ -41 +41 @@
 {
     /**
-        @brief Constructor. Registers the BaseItem.
-        @param creator Pointer to the object which created this item.
+    @brief Constructor. Registers the BaseItem.
+    @param creator Pointer to the object which created this item.
     */
     BaseItem::BaseItem(BaseObject* creator) : BaseObject(creator)
@@ -59 +59 @@
 
     /**
-        @brief XMLPort for BaseItem.
-        @param xmlelement Element of the XML-file.
-        @param mode XMLPort mode to use.
+    @brief XMLPort for BaseItem.
+    @param xmlelement Element of the XML-file.
+    @param mode XMLPort mode to use.
     */
     void BaseItem::XMLPort(Element& xmlelement, XMLPort::Mode mode)
@@ -72 +72 @@
 
     /**
-        @brief Method to add the item to a pawn.
-        @param pawn Pawn to which the item should get added.
-        @return Returns whether the pawn's PickupCollection accepted the item.
+    @brief Method to add the item to a pawn.
+    @param pawn Pawn to which the item should get added.
+    @return Returns whether the pawn's PickupCollection accepted the item.
     */
     bool BaseItem::addTo(Pawn* pawn)
@@ -80 +80 @@
         this->setOwner(pawn);
 
-        if (pawn->getPickups().add(this))
+        if (pawn->getPickups().add(this)) //TODO: Does the pawn store his pickups?
         {
             COUT(3) << "Added '" << this->getPickupIdentifier() << "' item." << std::endl;