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

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

@@ -125 +125 @@
     @return
         Returns true if the Quest can be started, false if not.
-    @throws
-        Throws an exception if isInactive(PlayerInfo*) throws one.
     */
     bool LocalQuest::isStartable(const PlayerInfo* player) const
@@ -143 +141 @@
     @return
         Returns true if the Quest can be failed, false if not.
-    @throws
-        Throws an exception if isActive(PlayerInfo*) throws one.
     */
     bool LocalQuest::isFailable(const PlayerInfo* player) const
@@ -158 +154 @@
     @return
         Returns true if the Quest can be completed, false if not.
-    @throws
-        Throws an exception if isInactive(PlayerInfo*) throws one.
     */
     bool LocalQuest::isCompletable(const PlayerInfo* player) const
@@ -173 +167 @@
     @return
         Returns the status of the Quest for the input player.
-    @throws
-        Throws an Exception if player is NULL.
     */
     QuestStatus::Value LocalQuest::getStatus(const PlayerInfo* player) const
     {
-        //TODO: Replace with assert.
-        if(player == NULL) // No player has no defined status.
-            ThrowException(Argument, "The input PlayerInfo* is NULL.");
+        assert(player);
 
         std::map<const PlayerInfo*, QuestStatus::Value>::const_iterator it = this->playerStatus_.find(player);
@@ -202 +192 @@
     bool LocalQuest::setStatus(PlayerInfo* player, const QuestStatus::Value & status)
     {
-        //TODO: Replace with assert.
-        if(player == NULL) // We can't set a status for no player.
-            return false;
+        assert(player);
 
         this->playerStatus_[player] = status;