Changeset 5754

Timestamp:

Sep 20, 2009, 5:09:20 PM (15 years ago)

Author:

dafrick

Message:

some minor changes…

Location:

code/trunk

Files:

• data/gui/scripts/QuestGUI.lua (modified) (2 diffs)
• src/modules/questsystem/CMakeLists.txt (modified) (1 diff)
• src/orxonox/pickup/items/Jump.cc (modified) (1 diff)

code/trunk/data/gui/scripts/QuestGUI.lua

@@ -1 @@
--- QuestGUI
-
-BasicGUI = require("BasicGUI")
+gui = require("BasicGUI")
 local P = BasicGUI:new() --inherit everything from the gui package
 if _REQUIREDNAME == nil then
@@ -12 +10 @@
 P.layoutString = "QuestGUI.layout"
 
-local windowManager = CEGUI.WindowManager:getSingleton()
--- local playerManager = orxonox.PlayerManager
-local questManager = orxonox.QuestManager:getInstance()
-
-local quests = {}
-
--- overwrites load function of previous load function
-function P:load()
-    element = P.__index.load(P) -- calling load function of parent class with ourselves and do other stuff now
-    --win = winMgr:getWindow("orxonox/LevelListBox")
-    --print(win.getItemCount())
-    --item = winMgr:createWindow("TaharezLook/ListboxItem", "orxonox/LevelListBoxItem1")
-    --item:setText("HiHo")
-    --win:addItem(item)
-    --print(win:getItemCount())
-    return element
-end
-
 function P:show()
     self.window:show() -- TDO: Do this through parent...
     self.visible = true
 
+    local questManager = orxonox.QuestManager:getInstance()
+      
     local questsList = windowManager:getWindow("orxonox/QuestGUI/QuestsList")
 

code/trunk/src/modules/questsystem/CMakeLists.txt

@@ -27 +27 @@
   FIND_HEADER_FILES
   TOLUA_FILES
-    QuestDescription.h
     QuestManager.h
   DEFINE_SYMBOL

code/trunk/src/orxonox/pickup/items/Jump.cc

@@ -72 +72 @@
     /**
         @brief Called when the item is used, makes the user "jump".
-        @param pawn Pawn which used te item.
+        @param pawn Pawn which used the item.
     */
     void Jump::used(Pawn* pawn)