Changeset 11054 for code/branches/cpp11_v3/src/orxonox/controllers/DroneController.cc

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/DroneController.cc (modified) (1 diff)

code/branches/cpp11_v3/src/orxonox/controllers/DroneController.cc

@@ -49 +49 @@
         RegisterObject(DroneController);
 
-        this->owner_ = 0;
-        this->drone_ = 0;
+        this->owner_ = nullptr;
+        this->drone_ = nullptr;
         this->isShooting_ = false;
         this->setAccuracy(10);