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

Timestamp:

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

Author:

dafrick

Message:

Documenting and cleanup.

Location:

code/trunk/src/orxonox/worldentities/pawns

Files:

• Pawn.h (modified) (2 diffs)
• SpaceShip.cc (modified) (1 diff)
• SpaceShip.h (modified) (1 diff)

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

@@ -128 +128 @@
                 { return this->aimPosition_; }
 
-            virtual const Vector3& getCarrierPosition(void)
+            virtual const Vector3& getCarrierPosition(void) const
                 { return this->getWorldPosition(); };
 
@@ -144 +144 @@
             bool bAlive_;
 
-            virtual std::vector<PickupCarrier*>* getCarrierChildren(void)
+            virtual std::vector<PickupCarrier*>* getCarrierChildren(void) const
                 { return new std::vector<PickupCarrier*>(); }
-            virtual PickupCarrier* getCarrierParent(void)
+            virtual PickupCarrier* getCarrierParent(void) const
                 { return NULL; }
 

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

@@ -221 +221 @@
     }
 
-    std::vector<PickupCarrier*>* SpaceShip::getCarrierChildren(void)
+    std::vector<PickupCarrier*>* SpaceShip::getCarrierChildren(void) const
     {
         std::vector<PickupCarrier*>* list = new std::vector<PickupCarrier*>();

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

@@ -85 +85 @@
 
         protected:
-            virtual std::vector<PickupCarrier*>* getCarrierChildren(void);
+            virtual std::vector<PickupCarrier*>* getCarrierChildren(void) const;
             bool bInvertYAxis_;