Changeset 3001 for code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc

Timestamp:

May 20, 2009, 9:01:17 PM (15 years ago)

Author:

danielh

Message:

• Added helper method to HumanController to get it's ControllableEntity as a Pawn
• Removed tooltip, added default (empty) values for text and image from BaseItem
• Fixed tolua in BaseItem.h
• Added object to PickupCollection for the current UsableItem
• Moved most inventory logic from Lua to PickupInventory (still slow)

TODO

• Re-use of CEGUI item windows, destroying and creating them on each update is slow, very slow

File:

• code/branches/pickups2/src/orxonox/objects/pickup/PickupCollection.cc (modified) (5 diffs)

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

@@ -49 +49 @@
     {
         this->bBlockRemovals_ = false;
+        this->currentUsable_ = NULL;
     }
 
@@ -64 +65 @@
         if (this->checkSlot(item))
         {
+            Identifier* ident = Class(UsableItem);
+            if(this->currentUsable_ == NULL && item->isA(ident))
+                this->currentUsable_ = dynamic_cast<UsableItem*>(item);
+
             this->items_.insert( std::pair<std::string, BaseItem*> (item->getPickupIdentifier(), item) );
             return true;
@@ -99 +104 @@
                 (*it).second->dropped((*it).second->getOwner());
         }
+        this->currentUsable_ = NULL;
         this->items_.clear();
         this->bBlockRemovals_ = false;
@@ -130 +136 @@
     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;
-            }
-        }
+        if(this->currentUsable_)
+            this->currentUsable_->used(this->owner_);
     }
     /**
@@ -160 +158 @@
             return;
 
+        if (item == this->currentUsable_ || (this->currentUsable_ && removeAllOfType && this->currentUsable_->getPickupIdentifier() == item->getPickupIdentifier()))
+        {
+            std::deque<UsableItem*> usables = this->getUsableItems();
+
+            if(usables.size() > 0)
+                this->currentUsable_ = usables.at(0);
+            else
+                this->currentUsable_ = NULL;
+        }
         if (removeAllOfType)
         {