[Orxonox-commit 1033] r5754 - in code/trunk: data/gui/scripts src/modules/questsystem src/orxonox/pickup/items

[dafrick at orxonox.net]

Author: dafrick
Date: 2009-09-20 17:09:20 +0200 (Sun, 20 Sep 2009)
New Revision: 5754

Modified:
   code/trunk/data/gui/scripts/QuestGUI.lua
   code/trunk/src/modules/questsystem/CMakeLists.txt
   code/trunk/src/orxonox/pickup/items/Jump.cc
Log:
some minor changes...

Modified: code/trunk/data/gui/scripts/QuestGUI.lua
===================================================================
--- code/trunk/data/gui/scripts/QuestGUI.lua	2009-09-20 13:45:58 UTC (rev 5753)
+++ code/trunk/data/gui/scripts/QuestGUI.lua	2009-09-20 15:09:20 UTC (rev 5754)
@@ -1,6 +1,4 @@
--- QuestGUI
-
-BasicGUI = require("BasicGUI")
+gui = require("BasicGUI")
 local P = BasicGUI:new() --inherit everything from the gui package
 if _REQUIREDNAME == nil then
     QuestGUI = P
@@ -11,28 +9,12 @@
 P.filename = "QuestGUI"
 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")
 
     local window = questManager:getQuestGUI(P.filename)

Modified: code/trunk/src/modules/questsystem/CMakeLists.txt
===================================================================
--- code/trunk/src/modules/questsystem/CMakeLists.txt	2009-09-20 13:45:58 UTC (rev 5753)
+++ code/trunk/src/modules/questsystem/CMakeLists.txt	2009-09-20 15:09:20 UTC (rev 5754)
@@ -26,7 +26,6 @@
   MODULE
   FIND_HEADER_FILES
   TOLUA_FILES
-    QuestDescription.h
     QuestManager.h
   DEFINE_SYMBOL
     "QUESTSYSTEM_SHARED_BUILD"

Modified: code/trunk/src/orxonox/pickup/items/Jump.cc
===================================================================
--- code/trunk/src/orxonox/pickup/items/Jump.cc	2009-09-20 13:45:58 UTC (rev 5753)
+++ code/trunk/src/orxonox/pickup/items/Jump.cc	2009-09-20 15:09:20 UTC (rev 5754)
@@ -71,7 +71,7 @@
     }
     /**
         @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)
     {