Changeset 6666

Timestamp:

Mar 31, 2010, 2:37:45 AM (14 years ago)

Author:

rgrieder

Message:

Fixed problem that can occur when BasicGUI cannot be loaded.

Location:

code/branches/gamestates2/data/gui/scripts

Files:

• CreditsMenu.lua (modified) (1 diff)
• GUITools.lua (modified) (1 diff)

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

@@ -1 +1 @@
 -- CreditsMenu.lua
 
-local sheetName = _REQUIREDNAME or "CreditsMenu"
--- Create object of type BasicGUI and make it global
-local P = require("BasicGUI"):new(sheetName)
-_G[sheetName] = P
+local P = createSheet("CreditsMenu")
 
 function P.CreditsBackButton_clicked(e)

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

@@ -1 +1 @@
 function createSheet(sheetName)
     -- Create object of type BasicGUI and make it global
-    local sheet = require("BasicGUI"):new(sheetName)
+    local basicGUI = require("BasicGUI")
+    if basicGUI == nil then
+        error("Loading BasicGUI.lua failed")
+    end
+    local sheet = basicGUI:new(sheetName)
     _G[sheetName] = sheet
     return sheet