Changeset 10765 for code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.cc

Timestamp:

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

Author:

landauf

Message:

replace 'NULL' by 'nullptr'

File:

• code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.cc (modified) (3 diffs)

code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.cc

@@ -113 +113 @@
 
         PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
-        PlayerInfo* player = NULL;
+        PlayerInfo* player = nullptr;
 
         // If the trigger is a PlayerTrigger.
-        if(pTrigger != NULL)
+        if(pTrigger != nullptr)
         {
             if(!pTrigger->isForPlayer())  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
@@ -126 +126 @@
             return false;
 
-        if(player == NULL)
+        if(player == nullptr)
         {
             orxout(verbose, context::quests) << "The QuestEffectBeacon was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << endl;
@@ -243 +243 @@
             i--;
         }
-        return NULL;
+        return nullptr;
     }