Changeset 11054 for code/branches/cpp11_v3/src/modules/questsystem/effects/AddQuestHint.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/modules/questsystem/effects/AddQuestHint.cc (modified) (1 diff)

code/branches/cpp11_v3/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;
         }