Changeset 10765 for code/branches/cpp11_v2/src/modules/questsystem/effects

Timestamp:

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

Author:

landauf

Message:

replace 'NULL' by 'nullptr'

Location:

code/branches/cpp11_v2/src/modules/questsystem/effects

Files:

• AddQuest.cc (modified) (1 diff)
• AddQuestHint.cc (modified) (1 diff)
• AddReward.cc (modified) (1 diff)
• CompleteQuest.cc (modified) (1 diff)
• FailQuest.cc (modified) (1 diff)

code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuest.cc

@@ -90 +90 @@
         {
             Quest* quest = QuestManager::getInstance().findQuest(this->getQuestId());
-            if(quest == NULL || !quest->start(player))
+            if(quest == nullptr || !quest->start(player))
                return false;
         }

code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuestHint.cc

@@ -113 +113 @@
         {
             QuestHint* hint = QuestManager::getInstance().findHint(this->hintId_);
-            if(hint == NULL || !hint->setActive(player))
+            if(hint == nullptr || !hint->setActive(player))
                 return false;
         }

code/branches/cpp11_v2/src/modules/questsystem/effects/AddReward.cc

@@ -90 +90 @@
             i--;
         }
-        return NULL;
+        return nullptr;
     }
 

code/branches/cpp11_v2/src/modules/questsystem/effects/CompleteQuest.cc

@@ -92 +92 @@
         {
             quest = QuestManager::getInstance().findQuest(this->getQuestId());
-            if(quest == NULL || !quest->complete(player))
+            if(quest == nullptr || !quest->complete(player))
                return false;
         }

code/branches/cpp11_v2/src/modules/questsystem/effects/FailQuest.cc

@@ -91 +91 @@
         {
             quest = QuestManager::getInstance().findQuest(this->getQuestId());
-            if(quest == NULL || !quest->fail(player))
+            if(quest == nullptr || !quest->fail(player))
                return false;
         }