Changeset 7547 for code/trunk/src/modules/pickup/PickupSpawner.cc

Timestamp:

Oct 16, 2010, 12:37:09 PM (14 years ago)

Author:

dafrick

Message:

Documenting and cleanup.

File:

• code/trunk/src/modules/pickup/PickupSpawner.cc (modified) (3 diffs)

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

@@ -38 +38 @@
 #include "core/Template.h"
 #include "core/XMLPort.h"
+
 #include "worldentities/pawns/Pawn.h"
+
 #include "PickupManager.h"
 #include "PickupRepresentation.h"
@@ -187 +189 @@
                 PickupCarrier* carrier = dynamic_cast<PickupCarrier*>(*it);
                 // If a Pawn, that fits the target-range of the item spawned by this Pickup, is in trigger-distance.
-                if (distance.length() < this->triggerDistance_ && carrier != NULL && carrier->isTarget(this->pickup_))
+                if (distance.length() < this->triggerDistance_ && carrier != NULL)
                 {
-                    this->trigger(*it);
+                    if(carrier->isTarget(this->pickup_))
+                        this->trigger(*it);
                 }
             }
@@ -270 +273 @@
         Returns the Pickupable that is spawned by this PickupSpawner.
     */
-    const Pickupable* PickupSpawner::getPickupable(void)
+    const Pickupable* PickupSpawner::getPickupable(void) const
     {
         return this->pickup_;