Changeset 11422
- Timestamp:
- May 18, 2017, 2:55:34 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua
r11421 r11422 71 71 function P.update() 72 72 orxout("UPDATING") 73 P. createInventory()73 P.updateInventory() 74 74 if P.showing == false then 75 75 return … … 89 89 local pickupManager = orxonox.DialogueManager:getInstance() 90 90 91 localroot = winMgr:getWindow("orxonox/Dialogue/Inventory")91 root = winMgr:getWindow("orxonox/Dialogue/Inventory") 92 92 local question = orxonox.DialogueManager:getInstance():getquestion() 93 93 root:setText(question) … … 97 97 98 98 99 localdetailsButton = winMgr:createWindow("MenuWidgets/Button", "/DetailsButton")99 detailsButton = winMgr:createWindow("MenuWidgets/Button", "/DetailsButton") 100 100 local a1 = orxonox.DialogueManager:getInstance():getanswers1() 101 101 detailsButton:setPosition(CEGUI.UVector2(CEGUI.UDim(0.1, 0),CEGUI.UDim(0.25, 0))) … … 105 105 P.wrapper:addChildWindow(detailsButton) 106 106 107 locala2Button = winMgr:createWindow("MenuWidgets/Button", "/a2Button")107 a2Button = winMgr:createWindow("MenuWidgets/Button", "/a2Button") 108 108 local a2 = orxonox.DialogueManager:getInstance():getanswers2() 109 109 a2Button:setPosition(CEGUI.UVector2(CEGUI.UDim(0.1, 0),CEGUI.UDim(0.4, 0))) … … 116 116 end 117 117 118 function P.updateInventory() 119 local questionn = orxonox.DialogueManager:getInstance():getquestion() 120 root:setText(questionn) 121 local a1n = orxonox.DialogueManager:getInstance():getanswers1() 122 detailsButton:setText(a1n) 123 local a2n = orxonox.DialogueManager:getInstance():getanswers2() 124 a2Button:setText(a2n) 125 126 end 118 127 119 128
Note: See TracChangeset
for help on using the changeset viewer.