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

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

@@ -83 +83 @@
     @param player
         The player.
-    @throws
-        Throws an Argument Exception if the input Player-pointer is NULL.
     @return
         Returns true if the QuestHint is active for the specified player.
@@ -90 +88 @@
     bool QuestHint::isActive(const PlayerInfo* player) const
     {
-        //TODO: Replace with assert.
-        if(player == NULL) // NULL-Pointers are ugly!
-        {
-            ThrowException(Argument, "The input PlayerInfo* is NULL.");
+        if(player == NULL) // If the player is NULL, the Quest obviously can't be active.
             return false;
-        }
 
         // Find the player.
@@ -145 +139 @@
     bool QuestHint::setQuest(Quest* quest)
     {
-        //TODO: Replace with assert.
-        if(quest == NULL) // NULL-Pointer. Again..?
-        {
-            COUT(2) << "The input Quest* is NULL." << std::endl;
-            return false;
-        }
+        assert(quest);
 
         this->quest_ = quest;