diff --git a/modules/corelib/settings.lua b/modules/corelib/settings.lua index 11aa29eb..0eeaae81 100644 --- a/modules/corelib/settings.lua +++ b/modules/corelib/settings.lua @@ -1,47 +1,3 @@ -local config = g_configs.getSettings() +g_settings = makesingleton(g_configs.getSettings()) -g_settings = makesingleton(config) - -function g_settings.set(key, value) - config:set(key, value) -end - -function g_settings.setDefault(key, value) - return config:setDefault(key, value) -end - -function g_settings.get(key, default) - return config:get(key, default) -end - -function g_settings.getString(key, default) - return config:getString(key, default) -end - -function g_settings.getInteger(key, default) - return config:getInteger(key, default) -end - -function g_settings.getNumber(key, default) - return config:getNumber(key, default) -end - -function g_settings.getBoolean(key, default) - return config:getBoolean(key, default) -end - -function g_settings.getPoint(key, default) - return config:getPoint(key, default) -end - -function g_settings.getRect(key, default) - return config:getRect(key, default) -end - -function g_settings.getSize(key, default) - return config:getSize(key, default) -end - -function g_settings.getColor(key, default) - return config:getColor(key, default) -end \ No newline at end of file +-- Reserved for future functionality diff --git a/modules/corelib/util.lua b/modules/corelib/util.lua index 04a4857f..9e8d110f 100644 --- a/modules/corelib/util.lua +++ b/modules/corelib/util.lua @@ -337,7 +337,7 @@ function makesingleton(obj) if obj.getClassName then for key,value in pairs(_G[obj:getClassName()]) do if type(value) == 'function' then - singleton[key] = function(...) value(obj, ...) end + singleton[key] = function(...) return value(obj, ...) end end end end