Changeset 8843 for code/branches
- Timestamp:
- Aug 14, 2011, 6:45:57 PM (13 years ago)
- Location:
- code/branches/ai2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/ai2/data/gui/scripts/QuestGUI.lua
r8842 r8843 5 5 P.questManager = nil -- The QuestManager. 6 6 P.showActive = true -- Whether the active or finished quest list is displayed. 7 P.currentQuest = nil -- The quest that is currently displayed.8 7 P.player = nil -- The player the quests are displayed for. 9 8 P.quests = {} … … 29 28 30 29 -- Load the list of quests to be displayed. 31 P.loadQuestsList( P.currentQuest)30 P.loadQuestsList() 32 31 -- Pause the game - possible conflict for multiplayer quests 33 32 orxonox.execute("setPause 1") … … 177 176 window:setSize(CEGUI.UVector2(CEGUI.UDim(1, -P.borderSize-P.scrollbarWidth), CEGUI.UDim(0,offset+P.borderSize))) 178 177 end 179 180 P.currentQuest = quest181 178 end 182 179 … … 210 207 end 211 208 hints:setSize(CEGUI.UVector2(CEGUI.UDim(1, -P.scrollbarWidth-P.borderSize), CEGUI.UDim(0, 0))) 212 213 P.currentQuest = nil214 209 end 215 210 … … 264 259 window:setID(index) 265 260 hintsWindow:addChildWindow(window) 266 local description = P.questManager:get HintDescription(hint)261 local description = P.questManager:getDescription(hint) 267 262 window:setText(description:getDescription()) 268 263 window:setSize(CEGUI.UVector2(CEGUI.UDim(1, -P.borderSize), CEGUI.UDim(1, 0))) -
code/branches/ai2/src/modules/questsystem/QuestManager.cc
r8842 r8843 400 400 Returns a pointer to the QuestDescription of the input QuestHint. 401 401 */ 402 QuestDescription* QuestManager::get HintDescription(QuestHint* item)402 QuestDescription* QuestManager::getDescription(QuestHint* item) 403 403 { 404 404 OrxAssert(item, "The input QuestHint is NULL."); … … 428 428 Returns the id of the input QuestHint. 429 429 */ 430 const std::string QuestManager::get HintId(QuestHint* item) const430 const std::string QuestManager::getId(QuestHint* item) const 431 431 { 432 432 OrxAssert(item, "The input QuestHint is NULL."); -
code/branches/ai2/src/modules/questsystem/QuestManager.h
r8842 r8843 84 84 85 85 QuestDescription* getDescription(Quest* item); //!< Get the QuestDescription of the input Quest. 86 QuestDescription* get HintDescription(QuestHint* item); //!< Get the QuestDescription of the input QuestHint.86 QuestDescription* getDescription(QuestHint* item); //!< Get the QuestDescription of the input QuestHint. 87 87 88 88 const std::string getId(Quest* item) const; //!< Get the id of the input Quest. 89 const std::string get HintId(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. 90 90 // tolua_end 91 91
Note: See TracChangeset
for help on using the changeset viewer.