- Timestamp:
- Oct 12, 2011, 7:50:43 PM (13 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
-
code/trunk/src/orxonox/worldentities/ControllableEntity.h
r8706 r8891 99 99 */ 100 100 virtual void boost(bool bBoost) {} 101 101 102 102 virtual void greet() {} 103 103 virtual void switchCamera(); … … 155 155 156 156 inline Controller* getController() const 157 { return this->controller_ ; }158 inline void setController(Controller* val)159 { this->controller_ = val; } 157 { return this->controller_.get(); } 158 void setController(Controller* val); 159 160 160 161 161 virtual void setTarget( WorldEntity* target ); … … 163 163 { return this->target_.get(); } 164 164 void setTargetInternal( uint32_t targetID ); 165 inline bool getRocket() const 166 { return this-> bIsRocket_; } 165 167 166 168 protected: … … 181 183 182 184 Ogre::SceneNode* cameraPositionRootNode_; 185 bool bIsRocket_; //Workaround to see, if the controllable entity is a Rocket. 183 186 184 187 private: … … 234 237 std::string cameraPositionTemplate_; 235 238 Controller* xmlcontroller_; 236 Controller*controller_;239 WeakPtr<Controller> controller_; 237 240 CameraPosition* reverseCamera_; 238 241 WeakPtr<WorldEntity> target_;
Note: See TracChangeset
for help on using the changeset viewer.