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

Timestamp:

Apr 13, 2010, 9:32:08 AM (15 years ago)

Author:

dafrick

Message:

Merged ppspickups1 into trunk.

Location:

code/trunk

Files:

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

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

@@ -220 +220 @@
             engine->addToSpaceShip(this);
     }
+
+    std::list<PickupCarrier*>* SpaceShip::getCarrierChildren(void)
+    {
+        std::list<PickupCarrier*>* list = new std::list<PickupCarrier*>();
+        list->push_front(this->engine_);
+        return list;
+    }
 }

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

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