Changeset 6711 for code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc
- Timestamp:
- Apr 13, 2010, 10:16:10 AM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/pickup4 (added) merged: 6632,6669,6675,6679,6700-6701,6707
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/worldentities/pawns/SpaceShip.cc
r6709 r6711 221 221 } 222 222 223 std:: list<PickupCarrier*>* SpaceShip::getCarrierChildren(void)224 { 225 std:: list<PickupCarrier*>* list = new std::list<PickupCarrier*>();226 list->push_ front(this->engine_);223 std::vector<PickupCarrier*>* SpaceShip::getCarrierChildren(void) 224 { 225 std::vector<PickupCarrier*>* list = new std::vector<PickupCarrier*>(); 226 list->push_back(this->engine_); 227 227 return list; 228 228 }
Note: See TracChangeset
for help on using the changeset viewer.