Changeset 6607 for code/branches/ppspickups1/src/orxonox/worldentities

Timestamp:

Mar 22, 2010, 10:45:09 PM (15 years ago)

Author:

ebeier

Message:

first working version of the SpeedPickup, needs some more work for "onUse" type. Spaceship trails need to be looked at, because they don't show when a SpeedPickup with SpeedAdd is used.

Location:

code/branches/ppspickups1/src/orxonox/worldentities/pawns

Files:

• SpaceShip.cc (modified) (1 diff)
• SpaceShip.h (modified) (1 diff)

code/branches/ppspickups1/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(engine_);
+        return list;
+    }
 }

code/branches/ppspickups1/src/orxonox/worldentities/pawns/SpaceShip.h

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