Changeset 10765 for code/branches/cpp11_v2/src/modules/weapons/IceGunFreezer.cc

Timestamp:

Nov 4, 2015, 10:25:42 PM (10 years ago)

Author:

landauf

Message:

replace 'NULL' by 'nullptr'

File:

• code/branches/cpp11_v2/src/modules/weapons/IceGunFreezer.cc (modified) (2 diffs)

code/branches/cpp11_v2/src/modules/weapons/IceGunFreezer.cc

@@ -101 +101 @@
 
         // Check if the freezer is attached to a parent and check if the parent is a SpaceShip
-        if (parent != NULL && parent->isA(Class(SpaceShip)))
+        if (parent != nullptr && parent->isA(Class(SpaceShip)))
         {
             freezedSpaceShip_ = orxonox_cast<SpaceShip*>(parent);
@@ -118 +118 @@
     void IceGunFreezer::stopFreezing()
     {
-        if (freezedSpaceShip_ != NULL && freezeFactor_ != 0.0)
+        if (freezedSpaceShip_ != nullptr && freezeFactor_ != 0.0)
         {
             freezedSpaceShip_->addSpeedFactor(1/freezeFactor_);