Changeset 6901

Timestamp:

May 15, 2010, 8:47:07 AM (14 years ago)

Author:

dafrick

Message:

Fixed PickupCollection. It works now the way it was intended and no restructuring of the pickupsystem was necessary.

Location:

code/trunk

Files:

• data/levels/pickup.oxw (modified) (1 diff)
• src/modules/pickup/PickupCollection.cc (modified) (1 diff)
• src/orxonox/interfaces/Pickupable.cc (modified) (1 diff)
• src/orxonox/interfaces/Pickupable.h (modified) (1 diff)

code/trunk/data/levels/pickup.oxw

@@ -114 +114 @@
     <!-- Pickup Collection pickups -->
     
-    <!--PickupSpawner position="0,-25,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
+    <PickupSpawner position="0,-25,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
         <pickup>
             <PickupCollection template=triplehealthspeedinvisibilitypickup />
         </pickup>
-    </PickupSpawner-->
+    </PickupSpawner>
     
   </Scene>

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

@@ -123 +123 @@
         for(std::vector<WeakPtr<Pickupable> >::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
         {
-            (*it).get()->setCarrier(this->getCarrier());
+            (*it).get()->setCarrier(this->getCarrier()->getTarget(*it));
         }
     }

code/trunk/src/orxonox/interfaces/Pickupable.cc

@@ -102 +102 @@
         Returns true if the given PickupCarrier is a target.
     */
-    bool Pickupable::isTarget(const PickupCarrier* carrier) const
+    bool Pickupable::isTarget(PickupCarrier* carrier) const
     {
         if(carrier == NULL)

code/trunk/src/orxonox/interfaces/Pickupable.h

@@ -98 +98 @@
             bool dropped(void); //!< Sets the Pickupable to not picked up or dropped.
             
-            virtual bool isTarget(const PickupCarrier* carrier) const; //!< Get whether the given PickupCarrier is a target of this pickup.
+            virtual bool isTarget(PickupCarrier* carrier) const; //!< Get whether the given PickupCarrier is a target of this pickup.
             bool isTarget(const Identifier* identifier) const; //!< Get whether a given class, represented by the input Identifier, is a target of this Pickupable.
             bool addTarget(PickupCarrier* target); //!< Add a PickupCarrier as target of this pickup.