[Orxonox-commit 4171] r8842 - in code/branches/ai2: data/gui/scripts src/modules/questsystem

[dafrick at orxonox.net]

Author: dafrick
Date: 2011-08-14 13:45:06 +0200 (Sun, 14 Aug 2011)
New Revision: 8842

Modified:
   code/branches/ai2/data/gui/scripts/QuestGUI.lua
   code/branches/ai2/src/modules/questsystem/QuestItem.h
   code/branches/ai2/src/modules/questsystem/QuestManager.cc
   code/branches/ai2/src/modules/questsystem/QuestManager.h
Log:
Renam to find bug.


Modified: code/branches/ai2/data/gui/scripts/QuestGUI.lua
===================================================================
--- code/branches/ai2/data/gui/scripts/QuestGUI.lua	2011-08-14 08:10:26 UTC (rev 8841)
+++ code/branches/ai2/data/gui/scripts/QuestGUI.lua	2011-08-14 11:45:06 UTC (rev 8842)
@@ -263,7 +263,7 @@
     window:setProperty("FrameEnabled", "false")
     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)))
     local height = getStaticTextWindowHeight(window)

Modified: code/branches/ai2/src/modules/questsystem/QuestItem.h
===================================================================
--- code/branches/ai2/src/modules/questsystem/QuestItem.h	2011-08-14 08:10:26 UTC (rev 8841)
+++ code/branches/ai2/src/modules/questsystem/QuestItem.h	2011-08-14 11:45:06 UTC (rev 8842)
@@ -104,7 +104,7 @@
             std::string id_; //!< Identifier. Must be unique.
             QuestDescription* description_; //!< The QuestDescription of the QuestItem.
 
-            bool registered_;
+            bool registered_; //!< Whether the QuestItem is registered with the QuestManager.
 
     };
 

Modified: code/branches/ai2/src/modules/questsystem/QuestManager.cc
===================================================================
--- code/branches/ai2/src/modules/questsystem/QuestManager.cc	2011-08-14 08:10:26 UTC (rev 8841)
+++ code/branches/ai2/src/modules/questsystem/QuestManager.cc	2011-08-14 11:45:06 UTC (rev 8842)
@@ -399,7 +399,7 @@
     @return
         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.");
         return item->getDescription();
@@ -427,7 +427,7 @@
     @return
         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.");
         return item->getId();

Modified: code/branches/ai2/src/modules/questsystem/QuestManager.h
===================================================================
--- code/branches/ai2/src/modules/questsystem/QuestManager.h	2011-08-14 08:10:26 UTC (rev 8841)
+++ code/branches/ai2/src/modules/questsystem/QuestManager.h	2011-08-14 11:45:06 UTC (rev 8842)
@@ -83,10 +83,10 @@
             Quest* getParentQuest(Quest* quest); //!< Get the parent-quest of the input Quest.
 
             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
 
             bool registerQuest(Quest* quest); //!< Registers a Quest in the QuestManager.