Changeset 7552 for code/trunk/src/modules/questsystem/QuestManager.cc

Timestamp:

Oct 17, 2010, 10:50:43 PM (14 years ago)

Author:

dafrick

Message:

Resolving some TODOs and doing some additional cleanup. Almost done now…

File:

• code/trunk/src/modules/questsystem/QuestManager.cc (modified) (2 diffs)

code/trunk/src/modules/questsystem/QuestManager.cc

@@ -100 +100 @@
     bool QuestManager::registerQuest(Quest* quest)
     {
-        //TODO: Replace with assert.
-        if(quest == NULL) // Doh! Just as if there were actual quests behind NULL-pointers.
-        {
-            COUT(2) << "Registration of Quest in QuestManager failed, because inserted Quest-pointer was NULL." << std::endl;
-            return false;
-        }
+        assert(quest);
 
         std::pair<std::map<std::string, Quest*>::iterator,bool> result;
@@ -143 +138 @@
     bool QuestManager::registerHint(QuestHint* hint)
     {
-        //TODO: Replace with assert.
-        if(hint == NULL) // Still not liking NULL-pointers.
-        {
-            COUT(2) << "Registration of QuestHint in QuestManager failed, because inserted QuestHint-pointer was NULL." << std::endl;
-            return false;
-        }
+        assert(hint);
 
         std::pair<std::map<std::string, QuestHint*>::iterator,bool> result;