Changeset 7552 for code/trunk/src/modules/questsystem/Quest.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/Quest.cc (modified) (10 diffs)

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

@@ -92 +92 @@
     bool Quest::setParentQuest(Quest* quest)
     {
-        //TODO: Replace with assert.
-        if(quest == NULL) // We don't want to set NULL-Pointers.
-        {
-            COUT(2) << "The parentquest to be added to quest {" << this->getId() << "} was NULL." << std::endl;
-            return false;
-        }
+        assert(quest);
 
         this->parentQuest_ = quest;
@@ -115 +110 @@
     bool Quest::addSubQuest(Quest* quest)
     {
-        //TODO: Replace with assert.
-        if(quest == NULL) // We don't want to set NULL-Pointers.
-        {
-            COUT(2) << "The subquest to be added to quest {" << this->getId() << "} was NULL." << std::endl;
-            return false;
-        }
+        assert(quest);
 
         quest->setParentQuest(this); // Sets the currentQuest (this) as parent-quest for the added sub-quest.
@@ -140 +130 @@
     bool Quest::addHint(QuestHint* hint)
     {
-        //TODO: Replace with assert.
-        if(hint == NULL) // We don't want to set NULL-Pointers. Seriously!
-        {
-            COUT(2) << "A NULL-QuestHint was trying to be added." << std::endl;
-            return false;
-        }
+        assert(hint);
 
         hint->setQuest(this); // Sets the current Quest (this) as Quest for the added QuestHint.
@@ -164 +149 @@
     bool Quest::addFailEffect(QuestEffect* effect)
     {
-        //TODO: Replace with assert.
-        if(effect == NULL) // We don't want to set NULL-Pointers.
-        {
-            COUT(2) << "A NULL-QuestEffect was trying to be added" << std::endl;
-            return false;
-        }
+        assert(effect);
 
         this->failEffects_.push_back(effect); // Adds the QuestEffect to the end of the list of fail QuestEffects.
@@ -187 +167 @@
     bool Quest::addCompleteEffect(QuestEffect* effect)
     {
-        //TODO: Replace with assert.
-        if(effect == NULL) // We don't want to set NULL-Pointers.
-        {
-            COUT(2) << "A NULL-QuestEffect was trying to be added" << std::endl;
-            return false;
-        }
+        assert(effect);
 
         this->completeEffects_.push_back(effect); // Adds the QuestEffect to the end of the list of complete QuestEffects.
@@ -300 +275 @@
     @return
         Returns true if the quest status for the specific player is 'inactive'.
-    @throws
-        Throws an exception if getStatus throws one.
     */
     bool Quest::isInactive(const PlayerInfo* player) const
     {
+        if(player == NULL)
+            return true;
         return this->getStatus(player) == QuestStatus::Inactive;
     }
@@ -315 +290 @@
     @return
         Returns true if the quest status for the specific player is 'active'.
-    @throws
-        Throws an exception if getStatus throws one.
     */
     bool Quest::isActive(const PlayerInfo* player) const
     {
+        if(player == NULL)
+            return false;
         return this->getStatus(player) == QuestStatus::Active;
     }
@@ -330 +305 @@
     @return
         Returns true if the quest status for the specific player is 'failed'.
-    @throws
-        Throws an exception if getStatus throws one.
     */
     bool Quest::isFailed(const PlayerInfo* player) const
     {
+        if(player == NULL)
+            return false;
         return this->getStatus(player) == QuestStatus::Failed;
     }
@@ -345 +320 @@
     @return
         Returns true if the quest status for the specific player is 'completed'.
-    @throws
-        Throws an exception if getStatus throws one.
     */
     bool Quest::isCompleted(const PlayerInfo* player) const
     {
+        if(player == NULL)
+            return false;
         return this->getStatus(player) == QuestStatus::Completed;
     }
@@ -427 +402 @@
     bool Quest::addListener(QuestListener* listener)
     {
-        //TODO: Replace with assert?
-        if(listener == NULL)
-        {
-            COUT(2) << "A NULL-QuestListener was trying to be added to a Quests listeners." << std::endl;
-            return false;
-        }
+        assert(listener);
 
         this->listeners_.push_back(listener);