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

code/branches/cpp11_v3/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;
@@ -244 +244 @@
         else
         {
-            this->munition_ = NULL;
+            this->munition_ = nullptr;
         }
     }