Changeset 8923 for code/branches/gamecontent/src/orxonox/worldentities

Timestamp:

Nov 4, 2011, 10:44:56 AM (13 years ago)

Author:

jo

Message:

Tutorial level enhancements (quest work, better texts are still needed), reverted old rocket hack, reworked configurable botlevel for the ai.

Location:

code/branches/gamecontent/src/orxonox/worldentities

Files:

• ControllableEntity.cc (modified) (1 diff)
• ControllableEntity.h (modified) (2 diffs)

code/branches/gamecontent/src/orxonox/worldentities/ControllableEntity.cc

@@ -74 +74 @@
         this->bMouseLook_ = false;
         this->mouseLookSpeed_ = 200;
-        this->bIsRocket_ = false;
 
         this->server_position_         = Vector3::ZERO;

code/branches/gamecontent/src/orxonox/worldentities/ControllableEntity.h

@@ -163 +163 @@
                 { return this->target_.get(); }
             void setTargetInternal( uint32_t targetID );
-            inline bool getRocket() const
-                { return this-> bIsRocket_; }
 
         protected:
@@ -183 +181 @@
 
             Ogre::SceneNode* cameraPositionRootNode_;
-            bool bIsRocket_; //Workaround to see, if the controllable entity is a Rocket.
 
         private: