Changeset 10765 for code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h

Timestamp:

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

Author:

landauf

Message:

replace 'NULL' by 'nullptr'

File:

• code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h (modified) (2 diffs)

code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h

@@ -208 +208 @@
 
             //virtual void damage(float damage, Pawn* originator = 0);
-            virtual void damage(float damage, float healthdamage = 0.0f, float shielddamage = 0.0f, Pawn* originator = NULL, const btCollisionShape* cs = NULL);
+            virtual void damage(float damage, float healthdamage = 0.0f, float shielddamage = 0.0f, Pawn* originator = nullptr, const btCollisionShape* cs = nullptr);
 
             bool bAlive_;
@@ -215 +215 @@
                 { return new std::vector<PickupCarrier*>(); }
             virtual PickupCarrier* getCarrierParent(void) const
-                { return NULL; }
+                { return nullptr; }