Changeset 8891 for code/trunk/src/modules/questsystem

Timestamp:

Oct 12, 2011, 7:50:43 PM (13 years ago)

Author:

jo

Message:

Ai and tutorial improvements merged back to the trunk. AI features: all weapons are used, the ai-firestrength is configurable, bots are able to collect pickups . I've set the tutorial level as default level.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/questsystem/QuestItem.h (modified) (1 diff)
• src/modules/questsystem/QuestManager.cc (modified) (9 diffs)

code/trunk/src/modules/questsystem/QuestItem.h

@@ -105 +105 @@
             QuestDescription* description_; //!< The QuestDescription of the QuestItem.
 
-            bool registered_;
+            bool registered_; //!< Whether the QuestItem is registered with the QuestManager.
 
     };

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

@@ -35 +35 @@
 
 #include "util/Exception.h"
+#include "util/OrxAssert.h"
 #include "util/ScopedSingletonManager.h"
 #include "core/command/ConsoleCommand.h"
@@ -60 +61 @@
     {
         RegisterRootObject(QuestManager);
-
         orxout(internal_info, context::quests) << "QuestManager created." << endl;
     }
@@ -95 +95 @@
     bool QuestManager::registerQuest(Quest* quest)
     {
-        assert(quest);
+        if(quest == NULL)
+        {
+            COUT(1) << "Quest pointer is NULL." << endl;
+            return false;
+        }
 
         std::pair<std::map<std::string, Quest*>::iterator,bool> result;
@@ -133 +137 @@
     bool QuestManager::registerHint(QuestHint* hint)
     {
-        assert(hint);
+        if(hint == NULL)
+        {
+            COUT(1) << "Hint pointer is NULL." << endl;
+            return false;
+        }
 
         std::pair<std::map<std::string, QuestHint*>::iterator,bool> result;
@@ -361 +369 @@
     Quest* QuestManager::getParentQuest(Quest* quest)
     {
+        OrxAssert(quest, "The input Quest is NULL.");
         return quest->getParentQuest();
     }
@@ -374 +383 @@
     QuestDescription* QuestManager::getDescription(Quest* item)
     {
+        OrxAssert(item, "The input Quest is NULL.");
         return item->getDescription();
     }
@@ -387 +397 @@
     QuestDescription* QuestManager::getDescription(QuestHint* item)
     {
+        OrxAssert(item, "The input QuestHint is NULL.");
         return item->getDescription();
     }
@@ -400 +411 @@
     const std::string QuestManager::getId(Quest* item) const
     {
+        OrxAssert(item, "The input Quest is NULL.");
         return item->getId();
     }
@@ -413 +425 @@
     const std::string QuestManager::getId(QuestHint* item) const
     {
+        OrxAssert(item, "The input QuestHint is NULL.");
         return item->getId();
     }