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

Timestamp:

May 23, 2009, 9:53:13 AM (15 years ago)

Author:

danielh

Message:

• minor fix in PickupCollection
• Made PickupInventory into a singleton
• PickupInventory now only creates new CEGUI windows if needed, and does not destroy unused ones

File:

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

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

@@ -158 +158 @@
             return;
 
+        bool getNewUsable = false;
         if (item == this->currentUsable_ || (this->currentUsable_ && removeAllOfType && this->currentUsable_->getPickupIdentifier() == item->getPickupIdentifier()))
+        {
+            getNewUsable = true;
+        }
+
+        if (removeAllOfType)
+        {
+            std::multimap<std::string, BaseItem*>::iterator it;
+            while ((it = this->items_.find(item->getPickupIdentifier())) != this->items_.end())
+            {
+                this->items_.erase(it);
+            }
+        }
+        else
+        {
+            std::multimap<std::string, BaseItem*>::_Pairii bounds = this->items_.equal_range(item->getPickupIdentifier());
+            for (std::multimap<std::string, BaseItem*>::iterator it = bounds.first; it != bounds.second && it != this->items_.end(); it++)
+            {
+                if ((*it).second == item)
+                {
+                    this->items_.erase(it);
+                    break;
+                }
+            }
+        }
+
+        if (getNewUsable)
         {
             std::deque<UsableItem*> usables = this->getUsableItems();
@@ -166 +193 @@
             else
                 this->currentUsable_ = NULL;
-        }
-        if (removeAllOfType)
-        {
-            std::multimap<std::string, BaseItem*>::iterator it;
-            while ((it = this->items_.find(item->getPickupIdentifier())) != this->items_.end())
-            {
-                this->items_.erase(it);
-            }
-        }
-        else
-        {
-            std::multimap<std::string, BaseItem*>::_Pairii bounds = this->items_.equal_range(item->getPickupIdentifier());
-            for (std::multimap<std::string, BaseItem*>::iterator it = bounds.first; it != bounds.second && it != this->items_.end(); it++)
-            {
-                if ((*it).second == item)
-                {
-                    this->items_.erase(it);
-                    return;
-                }
-            }
+            
         }
     }