Changeset 8843 for code/branches

Timestamp:

Aug 14, 2011, 6:45:57 PM (13 years ago)

Author:

dafrick

Message:

Fixing bug.

Location:

code/branches/ai2

Files:

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

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

@@ -5 +5 @@
 P.questManager = nil -- The QuestManager.
 P.showActive = true -- Whether the active or finished quest list is displayed.
-P.currentQuest = nil -- The quest that is currently displayed.
 P.player = nil -- The player the quests are displayed for.
 P.quests = {}
@@ -29 +28 @@
 
     -- Load the list of quests to be displayed.
-    P.loadQuestsList(P.currentQuest)
+    P.loadQuestsList()
     -- Pause the game - possible conflict for multiplayer quests
     orxonox.execute("setPause 1")
@@ -177 +176 @@
         window:setSize(CEGUI.UVector2(CEGUI.UDim(1, -P.borderSize-P.scrollbarWidth), CEGUI.UDim(0,offset+P.borderSize)))
     end
-
-    P.currentQuest = quest
 end
 
@@ -210 +207 @@
     end
     hints:setSize(CEGUI.UVector2(CEGUI.UDim(1, -P.scrollbarWidth-P.borderSize), CEGUI.UDim(0, 0)))
-
-    P.currentQuest = nil
 end
 
@@ -264 +259 @@
     window:setID(index)
     hintsWindow:addChildWindow(window)
-    local description = P.questManager:getHintDescription(hint)
+    local description = P.questManager:getDescription(hint)
     window:setText(description:getDescription())
     window:setSize(CEGUI.UVector2(CEGUI.UDim(1, -P.borderSize), CEGUI.UDim(1, 0)))

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

@@ -400 +400 @@
         Returns a pointer to the QuestDescription of the input QuestHint.
     */
-    QuestDescription* QuestManager::getHintDescription(QuestHint* item)
+    QuestDescription* QuestManager::getDescription(QuestHint* item)
     {
         OrxAssert(item, "The input QuestHint is NULL.");
@@ -428 +428 @@
         Returns the id of the input QuestHint.
     */
-    const std::string QuestManager::getHintId(QuestHint* item) const
+    const std::string QuestManager::getId(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* getHintDescription(QuestHint* item); //!< Get the QuestDescription of the input QuestHint.
+            QuestDescription* getDescription(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 getHintId(QuestHint* item) const; //!< Get the id of the input QuestHint.
+            const std::string getId(QuestHint* item) const; //!< Get the id of the input QuestHint.
             // tolua_end