Changeset 6731 for code/trunk/src/modules/pickup

Timestamp:

Apr 15, 2010, 2:47:39 PM (15 years ago)

Author:

dafrick

Message:

PickupCollection is broken for now because to make it work drastic changes would have to be made. I wil fix it at a later date, though.

Location:

code/trunk/src/modules/pickup

Files:

• PickupCollection.cc (modified) (1 diff)
• PickupCollection.h (modified) (1 diff)

code/trunk/src/modules/pickup/PickupCollection.cc

@@ -176 +176 @@
         Returns true if the PickupCarrier identified by the input PickupIdentififer it is a target of this PickupCollection, false if not.
     */
-    bool PickupCollection::isTarget(Identifier* identifier) const
+    bool PickupCollection::isTarget(PickupCarrier* carrier) const
     {
         for(std::vector<WeakPtr<Pickupable> >::const_iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
         {
-            if(!(*it).get()->isTarget(identifier))
+            if(!carrier->isTarget((*it).get()))
                 return false;
         }

code/trunk/src/modules/pickup/PickupCollection.h

@@ -67 +67 @@
             virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
             
-            virtual bool isTarget(Identifier* identifier) const; //!< Get whether a given class, represented by the input Identifier, is a target of this PickupCollection.
+            virtual bool isTarget(PickupCarrier* carrier) const; //!< Get whether a given class, represented by the input Identifier, is a target of this PickupCollection.
             
             virtual const PickupIdentifier* getPickupIdentifier(void); //!< Get the PickupIdentifier of this PickupCollection.