Changeset 2900 for code/branches/pickups/src/orxonox/objects/pickup/PickupCollection.cc

Timestamp:

Apr 6, 2009, 3:53:50 PM (16 years ago)

Author:

danielh

Message:

• some changes to the base framework
• added DroppedItem
• implemented usable items and a test UsableItem (Jump), console command to use an item is "useItem"
• added ModifierType::Acceleration

Location:

code/branches/pickups

Files:

• . (modified) (1 prop)
• src/orxonox/objects/pickup/PickupCollection.cc (modified) (2 diffs)

code/branches/pickups/src/orxonox/objects/pickup/PickupCollection.cc

@@ -94 +94 @@
         for (std::multimap<std::string, BaseItem*>::iterator it = this->items_.begin(); it != this->items_.end(); it++)
         {
-            (*it).second->dropped((*it).second->getOwner());
-
-            delete (*it).second;
+            if((*it).second && (*it).second->getOwner())
+                (*it).second->dropped((*it).second->getOwner());
         }
         this->items_.clear();
@@ -125 +124 @@
             return false;
         }
+    }
+    //! Uses the first usable item in the collection on the owner.
+    void PickupCollection::useItem()
+    {
+        Identifier* ident = Class(UsableItem);
+        for (std::multimap<std::string, BaseItem*>::iterator it = this->items_.begin(); it != this->items_.end(); it++)
+        {
+            if ((*it).second->isA(ident))
+            {
+                UsableItem* asUsable = dynamic_cast<UsableItem*>((*it).second);
+                asUsable->used(this->owner_);
+                return;
+            }
+        }
+    }
+    /**
+        @brief Uses a usable item on the owner of the collection.
+        @param item Item to use.
+    */
+    void PickupCollection::useItem(UsableItem* item)
+    {
+        if (item && this->owner_)
+            item->used(this->owner_);
     }
     /**