Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8843 for code/branches


Ignore:
Timestamp:
Aug 14, 2011, 6:45:57 PM (13 years ago)
Author:
dafrick
Message:

Fixing bug.

Location:
code/branches/ai2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/ai2/data/gui/scripts/QuestGUI.lua

    r8842 r8843  
    55P.questManager = nil -- The QuestManager.
    66P.showActive = true -- Whether the active or finished quest list is displayed.
    7 P.currentQuest = nil -- The quest that is currently displayed.
    87P.player = nil -- The player the quests are displayed for.
    98P.quests = {}
     
    2928
    3029    -- Load the list of quests to be displayed.
    31     P.loadQuestsList(P.currentQuest)
     30    P.loadQuestsList()
    3231    -- Pause the game - possible conflict for multiplayer quests
    3332    orxonox.execute("setPause 1")
     
    177176        window:setSize(CEGUI.UVector2(CEGUI.UDim(1, -P.borderSize-P.scrollbarWidth), CEGUI.UDim(0,offset+P.borderSize)))
    178177    end
    179 
    180     P.currentQuest = quest
    181178end
    182179
     
    210207    end
    211208    hints:setSize(CEGUI.UVector2(CEGUI.UDim(1, -P.scrollbarWidth-P.borderSize), CEGUI.UDim(0, 0)))
    212 
    213     P.currentQuest = nil
    214209end
    215210
     
    264259    window:setID(index)
    265260    hintsWindow:addChildWindow(window)
    266     local description = P.questManager:getHintDescription(hint)
     261    local description = P.questManager:getDescription(hint)
    267262    window:setText(description:getDescription())
    268263    window:setSize(CEGUI.UVector2(CEGUI.UDim(1, -P.borderSize), CEGUI.UDim(1, 0)))
  • code/branches/ai2/src/modules/questsystem/QuestManager.cc

    r8842 r8843  
    400400        Returns a pointer to the QuestDescription of the input QuestHint.
    401401    */
    402     QuestDescription* QuestManager::getHintDescription(QuestHint* item)
     402    QuestDescription* QuestManager::getDescription(QuestHint* item)
    403403    {
    404404        OrxAssert(item, "The input QuestHint is NULL.");
     
    428428        Returns the id of the input QuestHint.
    429429    */
    430     const std::string QuestManager::getHintId(QuestHint* item) const
     430    const std::string QuestManager::getId(QuestHint* item) const
    431431    {
    432432        OrxAssert(item, "The input QuestHint is NULL.");
  • code/branches/ai2/src/modules/questsystem/QuestManager.h

    r8842 r8843  
    8484
    8585            QuestDescription* getDescription(Quest* item); //!< Get the QuestDescription of the input Quest.
    86             QuestDescription* getHintDescription(QuestHint* item); //!< Get the QuestDescription of the input QuestHint.
     86            QuestDescription* getDescription(QuestHint* item); //!< Get the QuestDescription of the input QuestHint.
    8787
    8888            const std::string getId(Quest* item) const; //!< Get the id of the input Quest.
    89             const std::string getHintId(QuestHint* item) const; //!< Get the id of the input QuestHint.
     89            const std::string getId(QuestHint* item) const; //!< Get the id of the input QuestHint.
    9090            // tolua_end
    9191
Note: See TracChangeset for help on using the changeset viewer.