Changeset 6711 for code/trunk/src/orxonox/worldentities/pawns/SpaceShip.h

Timestamp:

Apr 13, 2010, 10:16:10 AM (15 years ago)

Author:

dafrick

Message:

Merged pickup4 branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/pawns/SpaceShip.h (modified) (1 diff)

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

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