Changeset 11071 for code/trunk/src/orxonox/worldentities/Drone.cc
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/worldentities/Drone.cc
r9667 r11071 30 30 31 31 #include "core/XMLPort.h" 32 #include "core/CoreIncludes.h" 32 33 #include "BulletDynamics/Dynamics/btRigidBody.h" 33 34 … … 43 44 RegisterObject(Drone); 44 45 45 this->myController_ = 0;46 this->myController_ = nullptr; 46 47 47 48 this->localLinearAcceleration_.setValue(0, 0, 0); 48 49 this->localAngularAcceleration_.setValue(0, 0, 0); 49 50 this->setRadarVisibility(false); 50 this->setCollisionType(WorldEntity:: Dynamic);51 this->setCollisionType(WorldEntity::CollisionType::Dynamic); 51 52 52 53 myController_ = new DroneController(this->getContext()); //!< Creates a new controller and passes our this pointer to it as creator.
Note: See TracChangeset
for help on using the changeset viewer.