Changeset 10558 for code/branches/core7/src/orxonox
- Timestamp:
- Aug 29, 2015, 6:45:20 PM (9 years ago)
- Location:
- code/branches/core7/src/orxonox
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core7/src/orxonox/interfaces/PlayerTrigger.h
r9667 r10558 63 63 */ 64 64 inline Pawn* getTriggeringPawn(void) const 65 { return this->pawn_ .get(); }65 { return this->pawn_; } 66 66 67 67 /** -
code/branches/core7/src/orxonox/overlays/OverlayGroup.cc
r10555 r10558 135 135 for (unsigned int i = 0; i != index; ++it, ++i) 136 136 ; 137 return it->get();137 return *it; 138 138 } 139 139 else -
code/branches/core7/src/orxonox/worldentities/ControllableEntity.cc
r10555 r10558 215 215 { 216 216 this->cameraPositions_.front()->attachCamera(this->camera_); 217 this->currentCameraPosition_ = this->cameraPositions_.front() .get();217 this->currentCameraPosition_ = this->cameraPositions_.front(); 218 218 } 219 219 else if (this->cameraPositions_.size() > 0) -
code/branches/core7/src/orxonox/worldentities/ControllableEntity.h
r10555 r10558 155 155 156 156 inline Controller* getController() const 157 { return this->controller_ .get(); }157 { return this->controller_; } 158 158 void setController(Controller* val); 159 159 … … 161 161 virtual void setTarget( WorldEntity* target ); 162 162 virtual WorldEntity* getTarget() 163 { return this->target_ .get(); }163 { return this->target_; } 164 164 void setTargetInternal( uint32_t targetID ); 165 165
Note: See TracChangeset
for help on using the changeset viewer.