Changeset 10768 for code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponMode.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/WeaponMode.cc (modified) (2 diffs)

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

@@ -51 +51 @@
         RegisterObject(WeaponMode);
 
-        this->weapon_ = 0;
+        this->weapon_ = nullptr;
         this->mode_ = WeaponSystem::WEAPON_MODE_UNASSIGNED;
 
-        this->munition_ = 0;
+        this->munition_ = nullptr;
         this->initialMunition_ = 0;
         this->initialMagazines_ = 0;
@@ -232 +232 @@
         }
         else
-            this->munition_ = 0;
+            this->munition_ = nullptr;
     }