Changeset 6540 for code/trunk/src/orxonox/worldentities

Timestamp:

Mar 16, 2010, 9:35:11 PM (14 years ago)

Author:

dafrick

Message:

Removed some TODO's. Finished up documenting pickup module.

Location:

code/trunk/src/orxonox/worldentities/pawns

Files:

• Pawn.cc (modified) (2 diffs)
• Pawn.h (modified) (3 diffs)

code/trunk/src/orxonox/worldentities/pawns/Pawn.cc

@@ -71 +71 @@
         this->aimPosition_ = Vector3::ZERO;
 
-        //TODO: Remove.
-        //this->getPickups().setOwner(this);
-
         if (GameMode::isMaster())
         {
@@ -297 +294 @@
     }
 
-//TODO: Remove.
-//     void Pawn::dropItems()
-//     {
-//         this->getPickups().clear();
-//     }
-
-
     /* WeaponSystem:
     *   functions load Slot, Set, Pack from XML and make sure all parent-pointers are set.

code/trunk/src/orxonox/worldentities/pawns/Pawn.h

@@ -109 +109 @@
                 { return this->numexplosionchunks_; }
 
-//TODO: Remove.
-//             virtual void dropItems();
-//             inline PickupCollection& getPickups()
-//                 { return this->pickups_; }
-//             virtual void useItem()
-//                 { this->pickups_.useItem(); }
-
             virtual void startLocalHumanControl();
 
@@ -122 +115 @@
             Vector3 getAimPosition()
                 { return this->aimPosition_; }
+                
+            virtual const Vector3& getCarrierPosition(void)
+                { return this->getWorldPosition(); };
 
         protected:
@@ -136 +132 @@
             bool bAlive_;
 
-            //TODO: Remove.
-            //PickupCollection pickups_;
             virtual std::list<PickupCarrier*>* getCarrierChildren(void)
                 { return new std::list<PickupCarrier*>(); }
             virtual PickupCarrier* getCarrierParent(void)
                 { return NULL; }
-            virtual const Vector3& getCarrierPosition(void)
-                { return this->getWorldPosition(); };
 
             float health_;