Changeset 8842 for code/branches

Timestamp:

Aug 14, 2011, 1:45:06 PM (13 years ago)

Author:

dafrick

Message:

Renam to find bug.

Location:

code/branches/ai2

Files:

• data/gui/scripts/QuestGUI.lua (modified) (1 diff)
• src/modules/questsystem/QuestItem.h (modified) (1 diff)
• src/modules/questsystem/QuestManager.cc (modified) (2 diffs)
• src/modules/questsystem/QuestManager.h (modified) (1 diff)

code/branches/ai2/data/gui/scripts/QuestGUI.lua

@@ -264 +264 @@
     window:setID(index)
     hintsWindow:addChildWindow(window)
-    local description = P.questManager:getDescription(hint)
+    local description = P.questManager:getHintDescription(hint)
     window:setText(description:getDescription())
     window:setSize(CEGUI.UVector2(CEGUI.UDim(1, -P.borderSize), CEGUI.UDim(1, 0)))

code/branches/ai2/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/branches/ai2/src/modules/questsystem/QuestManager.cc

@@ -400 +400 @@
         Returns a pointer to the QuestDescription of the input QuestHint.
     */
-    QuestDescription* QuestManager::getDescription(QuestHint* item)
+    QuestDescription* QuestManager::getHintDescription(QuestHint* item)
     {
         OrxAssert(item, "The input QuestHint is NULL.");
@@ -428 +428 @@
         Returns the id of the input QuestHint.
     */
-    const std::string QuestManager::getId(QuestHint* item) const
+    const std::string QuestManager::getHintId(QuestHint* item) const
     {
         OrxAssert(item, "The input QuestHint is NULL.");

code/branches/ai2/src/modules/questsystem/QuestManager.h

@@ -84 +84 @@
 
             QuestDescription* getDescription(Quest* item); //!< Get the QuestDescription of the input Quest.
-            QuestDescription* getDescription(QuestHint* item); //!< Get the QuestDescription of the input QuestHint.
+            QuestDescription* getHintDescription(QuestHint* item); //!< Get the QuestDescription of the input QuestHint.
 
             const std::string getId(Quest* item) const; //!< Get the id of the input Quest.
-            const std::string getId(QuestHint* item) const; //!< Get the id of the input QuestHint.
+            const std::string getHintId(QuestHint* item) const; //!< Get the id of the input QuestHint.
             // tolua_end