Changeset 6705 for code/branches/ppspickups1/src/orxonox
- Timestamp:
- Apr 13, 2010, 12:09:10 AM (15 years ago)
- Location:
- code/branches/ppspickups1/src/orxonox
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/ppspickups1/src/orxonox/items/Engine.h
r6643 r6705 115 115 virtual const Vector3& getCarrierPosition(void); 116 116 117 / * Should not be here */117 //TODO: Move to protected or private. How? 118 118 inline void setSpeedAdd(float speedAdd) 119 119 { this->speedAdd_=speedAdd; } -
code/branches/ppspickups1/src/orxonox/worldentities/pawns/SpaceShip.cc
r6607 r6705 224 224 { 225 225 std::list<PickupCarrier*>* list = new std::list<PickupCarrier*>(); 226 list->push_front( engine_);226 list->push_front(this->engine_); 227 227 return list; 228 228 }
Note: See TracChangeset
for help on using the changeset viewer.