Changeset 6519 for code/branches/pickup3/src/modules/pickup/PickupCollection.cc

Timestamp:

Mar 13, 2010, 3:32:34 PM (14 years ago)

Author:

dafrick

Message:

Started documenting MetaPcikup, resolved some bugs in PickupCollection and PickupCollectionIdentifier.

File:

• code/branches/pickup3/src/modules/pickup/PickupCollection.cc (modified) (4 diffs)

code/branches/pickup3/src/modules/pickup/PickupCollection.cc

@@ -45 +45 @@
 {
  
+    CreateFactory(PickupCollection);
+
     /**
     @brief
@@ -77 +79 @@
         SUPER(PickupCollection, XMLPort, xmlelement, mode);
         
-        //TODO: Does this work? Problem could be, that Pickupable itself cannot be instantiated through XML, doubt that, though.
-        XMLPortObject(PickupCollection, PickupCollection, "pickupables", addPickupable, getPickupable, xmlelement, mode);
+        XMLPortObject(PickupCollection, Pickupable, "pickupables", addPickupable, getPickupable, xmlelement, mode);
         
         this->initializeIdentifier();
@@ -103 +104 @@
     bool PickupCollection::createSpawner(const Vector3& position)
     {
-        DroppedPickup::DroppedPickup(this, this, position);
+        new DroppedPickup(this, this, position);
         return true;
     }
@@ -178 +179 @@
     }
     
+    bool PickupCollection::isTarget(Identifier* identifier) const
+    {
+        for(std::vector<Pickupable*>::const_iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
+        {
+            if(!(*it)->isTarget(identifier))
+                return false;
+        }
+        
+        return true;
+    }
+    
     const PickupIdentifier* PickupCollection::getPickupIdentifier(void)
     {