Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5754


Ignore:
Timestamp:
Sep 20, 2009, 5:09:20 PM (15 years ago)
Author:
dafrick
Message:

some minor changes…

Location:
code/trunk
Files:
3 edited

Legend:

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

    r5748 r5754  
    1 -- QuestGUI
    2 
    3 BasicGUI = require("BasicGUI")
     1gui = require("BasicGUI")
    42local P = BasicGUI:new() --inherit everything from the gui package
    53if _REQUIREDNAME == nil then
     
    1210P.layoutString = "QuestGUI.layout"
    1311
    14 local windowManager = CEGUI.WindowManager:getSingleton()
    15 -- local playerManager = orxonox.PlayerManager
    16 local questManager = orxonox.QuestManager:getInstance()
    17 
    18 local quests = {}
    19 
    20 -- overwrites load function of previous load function
    21 function P:load()
    22     element = P.__index.load(P) -- calling load function of parent class with ourselves and do other stuff now
    23     --win = winMgr:getWindow("orxonox/LevelListBox")
    24     --print(win.getItemCount())
    25     --item = winMgr:createWindow("TaharezLook/ListboxItem", "orxonox/LevelListBoxItem1")
    26     --item:setText("HiHo")
    27     --win:addItem(item)
    28     --print(win:getItemCount())
    29     return element
    30 end
    31 
    3212function P:show()
    3313    self.window:show() -- TDO: Do this through parent...
    3414    self.visible = true
    3515
     16    local questManager = orxonox.QuestManager:getInstance()
     17     
    3618    local questsList = windowManager:getWindow("orxonox/QuestGUI/QuestsList")
    3719
  • code/trunk/src/modules/questsystem/CMakeLists.txt

    r5749 r5754  
    2727  FIND_HEADER_FILES
    2828  TOLUA_FILES
    29     QuestDescription.h
    3029    QuestManager.h
    3130  DEFINE_SYMBOL
  • code/trunk/src/orxonox/pickup/items/Jump.cc

    r5738 r5754  
    7272    /**
    7373        @brief Called when the item is used, makes the user "jump".
    74         @param pawn Pawn which used te item.
     74        @param pawn Pawn which used the item.
    7575    */
    7676    void Jump::used(Pawn* pawn)
Note: See TracChangeset for help on using the changeset viewer.