Changeset 6659

Timestamp:

Mar 30, 2010, 4:34:01 PM (15 years ago)

Author:

rgrieder

Message:

Use "P." instead of "P:" when using our sheets as objects, not classes.
And use "P." instead of "self.".
This does not count for BasicGUI.lua because this is in fact seen as a class!!!

Location:

code/branches/gamestate/data/gui/scripts

Files:

• AudioMenu.lua (modified) (1 diff)
• GameplayMenu.lua (modified) (1 diff)
• GraphicsMenu.lua (modified) (1 diff)
• KeyBindMenu.lua (modified) (1 diff)
• MouseControlsMenu.lua (modified) (1 diff)
• MultiplayerMenu.lua (modified) (1 diff)
• PickupInventory.lua (modified) (5 diffs)
• QuestGUI.lua (modified) (1 diff)
• SingleplayerMenu.lua (modified) (1 diff)

code/branches/gamestate/data/gui/scripts/AudioMenu.lua

@@ -3 +3 @@
 local P = createSheet("AudioMenu")
 
-function P:init()
+function P.init()
     soundMgr = orxonox.SoundManager:getInstance()
     block = false

code/branches/gamestate/data/gui/scripts/GameplayMenu.lua

@@ -3 +3 @@
 local P = createSheet("GameplayMenu")
 
-function P:init()
+function P.init()
     dropdown = winMgr:getWindow("orxonox/ThemeCombobox")
     local themeList = {}

code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua

@@ -3 +3 @@
 local P = createSheet("GraphicsMenu")
 
-function P:init()
+function P.init()
     block = true
     file = orxonox.PathConfig:getConfigPathString() .. orxonox.getConfig("GraphicsManager", "ogreConfigFile_")

code/branches/gamestate/data/gui/scripts/KeyBindMenu.lua

@@ -3 +3 @@
 local P = createSheet("KeyBindMenu")
 
-function P:init()
+function P.init()
 
     commandList = {}

code/branches/gamestate/data/gui/scripts/MouseControlsMenu.lua

@@ -3 +3 @@
 local P = createSheet("MouseControlsMenu")
 
-function P:init()
+function P.init()
     block = false
     mousenormalscrollbarwindow = tolua.cast(winMgr:getWindow("orxonox/MouseNormalScrollbar"),"CEGUI::Scrollbar")

code/branches/gamestate/data/gui/scripts/MultiplayerMenu.lua

@@ -3 +3 @@
 local P = createSheet("MultiplayerMenu")
 
-function P:init()
+function P.init()
     listbox = winMgr:getWindow("orxonox/MultiplayerLevelListbox")
     preselect = orxonox.LevelManager:getInstance():getDefaultLevel()

code/branches/gamestate/data/gui/scripts/PickupInventory.lua

@@ -8 +8 @@
 
 -- events
-function P:frmUpdate(e)
+function P.frmUpdate(e)
     local equipCount = orxonox.PickupInventory:getEquipmentCount()
     local usableCount = orxonox.PickupInventory:getUsableCount()
 
-    if equipCount ~= self.lastEquipmentCount_ or usableCount ~= self.lastUsableCount_ then
-        self:updateTabs()
+    if equipCount ~= P.lastEquipmentCount_ or usableCount ~= P.lastUsableCount_ then
+        P.updateTabs()
     end
 end
@@ -25 +25 @@
 end
 
-function P:mItemClicked(e)
+function P.mItemClicked(e)
     local w = CEGUI.toWindowEventArgs(e).window
     local name = w:getName()
@@ -36 +36 @@
 
     if t == "use" then
-        if self.currentUsableID_ >= 0 then
-            winMgr:getWindow("orxonox/Inventory/Title/use/" .. self.currentUsableID_):setProperty("TextColours", "tl:FFFFFFFF tr:FFFFFFFF bl:FFFFFFFF br:FFFFFFFF")
+        if P.currentUsableID_ >= 0 then
+            winMgr:getWindow("orxonox/Inventory/Title/use/" .. P.currentUsableID_):setProperty("TextColours", "tl:FFFFFFFF tr:FFFFFFFF bl:FFFFFFFF br:FFFFFFFF")
         end
         orxonox.PickupInventory:selectUsable(tonumber(i))
-        self.currentUsableID_ = tonumber(i)
+        P.currentUsableID_ = tonumber(i)
         winMgr:getWindow("orxonox/Inventory/Title/use/" .. i):setProperty("TextColours", "tl:FFFF4444 tr:FFFF4444 bl:FFFF4444 br:FFFF4444")
     end
@@ -46 +46 @@
 
 -- methods
-function P:updateTabs()
+function P.updateTabs()
     local eqWin = winMgr:getWindow("orxonox/Inventory/TabControl/TabEquipment")
     local usWin = winMgr:getWindow("orxonox/Inventory/TabControl/TabUsable")
@@ -52 +52 @@
     orxonox.PickupInventory:getSingleton():updateTabs(winMgr, eqWin, usWin)
 
-    self.currentUsableID_ = orxonox.PickupInventory:getCurrentUsableIndex()
-    self.lastEquipmentCount_ = orxonox.PickupInventory:getEquipmentCount()
-    self.lastUsableCount_ = orxonox.PickupInventory:getUsableCount()
+    P.currentUsableID_ = orxonox.PickupInventory:getCurrentUsableIndex()
+    P.lastEquipmentCount_ = orxonox.PickupInventory:getEquipmentCount()
+    P.lastUsableCount_ = orxonox.PickupInventory:getUsableCount()
 end
 

code/branches/gamestate/data/gui/scripts/QuestGUI.lua

@@ -3 +3 @@
 local P = createSheet("QuestGUI")
 
-function P:show()
-    self.window:show() -- TDO: Do this through parent...
-    self.visible = true
+function P.show()
+    P.window:show() -- TDO: Do this through parent...
+    P.visible = true
 
     local questManager = orxonox.QuestManager:getInstance()

code/branches/gamestate/data/gui/scripts/SingleplayerMenu.lua

@@ -3 +3 @@
 local P = createSheet("SingleplayerMenu")
 
-function P:init()
+function P.init()
     listbox = winMgr:getWindow("orxonox/SingleplayerLevelListbox")
     preselect = orxonox.LevelManager:getInstance():getDefaultLevel()