Changeset 5432

Timestamp:

Mar 25, 2009, 11:48:19 PM (16 years ago)

Author:

rgrieder

Message:

Added inGameGUI test sheet.
Also removed workaround for the filename. Found another way by using executeString() in CEGUILua.

Location:

data/media/gui

Files:

• layouts/InGameTest.layout (added)
• scripts/inGameTest.lua (added)
• scripts/loadGUI_2.lua (modified) (3 diffs)

data/media/gui/scripts/loadGUI_2.lua

@@ -15 +15 @@
 local loadedGUIs = {}
 local showing
--- we cannot directly call functions with parameters and so need this as a global variable, which sucks of course
-filename = ""
+
 datapath = "" -- points to media-folder (set after loading the script)
 
@@ -36 +35 @@
 -- loads the GUI with the specified filename
 -- be sure to set the global variable "filename" before calling this function
-function loadGUI()
+function loadGUI(filename)
     -- check if it already exists
     newlyLoaded = loadedGUIs:getGUIbyName(filename)
     if newlyLoaded == nil then
-        dofile(datapath .. "gui/scripts/" .. filename)
+        dofile(datapath .. "gui/scripts/" .. filename .. ".lua")
         newlyLoaded = winMgr:loadWindowLayout(layoutPath)
         newlyLoaded.filename = filename
@@ -57 +56 @@
 -- shows the specified and loads it if not loaded already
 -- be sure to set the global variable "filename" before calling this function
-function showGUI()
+function showGUI(filename)
     if current == nil or current.filename ~= filename then
         current = loadedGUIs.getGUIbyName(filename)