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

Timestamp:

May 11, 2009, 6:03:40 PM (16 years ago)

Author:

danielh

Message:

Update

• Minor changes in BaseItem
• Updated to NotificationQueue from trunk (compile error with old)
• Added PickupInventory for GUI handling
• Added basic support for toLua++ methods

File:

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

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

@@ -38 +38 @@
 #include "PassiveItem.h"
 #include "UsableItem.h"
+
+#include "core/CoreIncludes.h"
 
 #include "objects/worldentities/pawns/Pawn.h"
@@ -312 +314 @@
         @return Returns a list of all the equipment-type items in the collection.
     */
-    std::set<BaseItem*> PickupCollection::getEquipmentItems()
-    {
-        std::set<BaseItem*> ret;
+    std::deque<EquipmentItem*> PickupCollection::getEquipmentItems()
+    {
+        std::deque<EquipmentItem*> ret;
         Identifier* ident = Class(EquipmentItem);
 
@@ -320 +322 @@
         {
             if ((*it).second->isA(ident))
-                ret.insert((*it).second);
+                ret.push_back(dynamic_cast<EquipmentItem*>((*it).second));
         }
 
@@ -329 +331 @@
         @return Returns a list of all the passive items in the collection.
     */
-    std::set<BaseItem*> PickupCollection::getPassiveItems()
-    {
-        std::set<BaseItem*> ret;
+    std::deque<PassiveItem*> PickupCollection::getPassiveItems()
+    {
+        std::deque<PassiveItem*> ret;
         Identifier* ident = Class(PassiveItem);
 
@@ -337 +339 @@
         {
             if ((*it).second->isA(ident))
-                ret.insert((*it).second);
+                ret.push_back(dynamic_cast<PassiveItem*>((*it).second));
         }
 
@@ -346 +348 @@
         @return Returns a list of all the usable items in the collection.
     */
-    std::set<BaseItem*> PickupCollection::getUsableItems()
-    {
-        std::set<BaseItem*> ret;
+    std::deque<UsableItem*> PickupCollection::getUsableItems()
+    {
+        std::deque<UsableItem*> ret;
         Identifier* ident = Class(UsableItem);
 
@@ -354 +356 @@
         {
             if ((*it).second->isA(ident))
-                ret.insert((*it).second);
+                ret.push_back(dynamic_cast<UsableItem*>((*it).second));
         }