Changeset 11054 for code/branches/cpp11_v3/src/modules/weapons/projectiles/Projectile.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/modules/weapons/projectiles/Projectile.cc (modified) (1 diff)

code/branches/cpp11_v3/src/modules/weapons/projectiles/Projectile.cc

@@ -94 +94 @@
     void Projectile::setCollisionShapeRadius(float radius)
     {
-        if (collisionShape_ != NULL && radius > 0)
+        if (collisionShape_ != nullptr && radius > 0)
         {
             collisionShape_->setRadius(radius);