Changeset 6720

Timestamp:

Apr 13, 2010, 3:58:56 PM (14 years ago)

Author:

rgrieder

Message:

"init" lua function —> "onLoad" to make it clear that it is a user function.

Location:

code/branches/gamestates2/data/gui/scripts

Files:

• AudioMenu.lua (modified) (1 diff)
• GUISheet.lua (modified) (2 diffs)
• 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)
• SingleplayerMenu.lua (modified) (1 diff)

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

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

code/branches/gamestates2/data/gui/scripts/GUISheet.lua

@@ -13 +13 @@
 
 -- Override this function if you need to do work on load
--- TODO: rename to onLoad
-function P:init()
+function P:onLoad()
 end
 
@@ -38 +37 @@
     self:hide()
     -- Allow sheets to do some work upon loading
-    self:init()
+    self:onLoad()
     return self
 end

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

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

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

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

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

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

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

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

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

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

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

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