Changeset 7547 for code/trunk/src/orxonox/items
- Timestamp:
- Oct 16, 2010, 12:37:09 PM (14 years ago)
- Location:
- code/trunk/src/orxonox/items
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/orxonox/items/Engine.cc
r7163 r7547 248 248 } 249 249 250 PickupCarrier* Engine::getCarrierParent(void) 250 PickupCarrier* Engine::getCarrierParent(void) const 251 251 { 252 252 return this->ship_; 253 253 } 254 254 255 const Vector3& Engine::getCarrierPosition(void) 255 const Vector3& Engine::getCarrierPosition(void) const 256 256 { 257 257 return this->ship_->getWorldPosition(); -
code/trunk/src/orxonox/items/Engine.h
r7163 r7547 112 112 virtual const Vector3& getDirection() const; 113 113 114 virtual const Vector3& getCarrierPosition(void) ;114 virtual const Vector3& getCarrierPosition(void) const; 115 115 116 116 //TODO: Move to protected or private. How? … … 121 121 122 122 protected: 123 virtual std::vector<PickupCarrier*>* getCarrierChildren(void) 123 virtual std::vector<PickupCarrier*>* getCarrierChildren(void) const 124 124 { return new std::vector<PickupCarrier*>(); } 125 virtual PickupCarrier* getCarrierParent(void) ;125 virtual PickupCarrier* getCarrierParent(void) const; 126 126 127 127 private:
Note: See TracChangeset
for help on using the changeset viewer.