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

Timestamp:

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

Author:

landauf

Message:

replace '0' by 'nullptr'

File:

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

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

@@ -45 +45 @@
         RegisterObject(Weapon);
 
-        this->weaponPack_ = 0;
-        this->weaponSlot_ = 0;
+        this->weaponPack_ = nullptr;
+        this->weaponSlot_ = nullptr;
         this->bReloading_ = false;
         this->reloadingWeaponmode_ = WeaponSystem::WEAPON_MODE_UNASSIGNED;
@@ -92 +92 @@
             ++i;
         }
-        return 0;
+        return nullptr;
     }