- Timestamp:
- Feb 15, 2012, 11:51:58 PM (12 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/worldentities/ControllableEntity.h
r8891 r9016 163 163 { return this->target_.get(); } 164 164 void setTargetInternal( uint32_t targetID ); 165 inline bool getRocket() const 166 { return this-> bIsRocket_; } 165 166 inline void setTeam(int team) 167 { this->team_ = team; } 168 inline float getTeam() const 169 { return this->team_; } 167 170 168 171 protected: … … 183 186 184 187 Ogre::SceneNode* cameraPositionRootNode_; 185 bool bIsRocket_; //Workaround to see, if the controllable entity is a Rocket.186 188 187 189 private: … … 240 242 CameraPosition* reverseCamera_; 241 243 WeakPtr<WorldEntity> target_; 244 245 int team_ ; //<! teamnumber 242 246 }; 243 247 }
Note: See TracChangeset
for help on using the changeset viewer.