Changeset 5661 for code/branches/resource2/data/gui/scripts/MainMenu.lua

Timestamp:

Aug 19, 2009, 12:19:11 AM (16 years ago)

Author:

rgrieder

Message:

Cleaned out the lua script files for the GUI.
Also replaced "require" function to support resources.
Fixed a problem with the return value of doFile, includeFile and require being discarded because the tolua binding is for a C++ function returning void.

File:

• code/branches/resource2/data/gui/scripts/MainMenu.lua (moved) (moved from code/branches/resource2/data/gui/scripts/mainmenu_4.lua) (2 diffs)

code/branches/resource2/data/gui/scripts/MainMenu.lua

@@ -1 @@
--- mainmenu_2.lua
-gui = require("gui")
-local P = gui:new() --inherit everything from the gui package
+-- MainMenu.lua
 
-mainmenu_2 = P
+BasicGUI = require("BasicGUI")
+local P = BasicGUI:new() --inherit everything from the gui package
+if _REQUIREDNAME == nil then
+    MainMenu = P
+else
+    _G[_REQUIREDNAME] = P
+end
 
-P.filename = "mainmenu_2"
-P.layoutString = "MainMenu_2.layout"
+P.filename = "MainMenu"
+P.layoutString = "MainMenu.layout"
 
 function P:init()
@@ -85 +89 @@
 end
 
-return mainmenu_2
+return P