Changeset 10768 for code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.cc

Timestamp:

Nov 6, 2015, 10:54:34 PM (9 years ago)

Author:

landauf

Message:

replace '0' by 'nullptr'

File:

• code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.cc (modified) (2 diffs)

code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.cc

@@ -43 +43 @@
         RegisterObject(WeaponSlot);
 
-        this->weaponSystem_ = 0;
-        this->weapon_ = 0;
+        this->weaponSystem_ = nullptr;
+        this->weapon_ = nullptr;
 
         this->setSyncMode(ObjectDirection::None);
@@ -88 +88 @@
         if (this->weapon_)
         {
-            this->weapon_->setWeaponSlot(0);
-            this->weapon_ = 0;
+            this->weapon_->setWeaponSlot(nullptr);
+            this->weapon_ = nullptr;
         }
     }