Changeset 6475 for code/branches/pickup3/src/orxonox/worldentities

Timestamp:

Mar 5, 2010, 6:26:54 PM (15 years ago)

Author:

dafrick

Message:

Additional documentation, code niceifying and potential bug fixing. Also: Renamed DroppedItem to DroppedPickup.

File:

• code/branches/pickup3/src/orxonox/worldentities/pawns/Pawn.h (modified) (1 diff)

code/branches/pickup3/src/orxonox/worldentities/pawns/Pawn.h

@@ -138 +138 @@
             //TODO: Remove.
             //PickupCollection pickups_;
-            virtual const std::list<PickupCarrier*>* getChildren(void)
+            virtual std::list<PickupCarrier*>* getCarrierChildren(void)
                 { return new std::list<PickupCarrier*>(); }
-            virtual PickupCarrier* getParent(void)
+            virtual PickupCarrier* getCarrierParent(void)
                 { return NULL; }
+            virtual const Vector3& getCarrierPosition(void)
+                { return this->getWorldPosition(); };
 
             float health_;